Hi Greg,
Today's linux-next merge of the tty tree got a conflict in
include/uapi/linux/serial_core.h between commit 002abee2d681 ("tilegx:
Add tty serial support for TILE-Gx on-chip UART") from the tile tree and
commit c4b058560762 ("serial:st-asc: Add ST ASC driver") from the tty
tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc include/uapi/linux/serial_core.h
index b466487,e40ebe1..0000000
--- a/include/uapi/linux/serial_core.h
+++ b/include/uapi/linux/serial_core.h
@@@ -232,7 -232,7 +232,10 @@@
/* SH-SCI */
#define PORT_HSCIF 104
+/* Tilera TILE-Gx UART */
+#define PORT_TILEGX 105
+
+ /* ST ASC type numbers */
-#define PORT_ASC 105
++#define PORT_ASC 106
+
#endif /* _UAPILINUX_SERIAL_CORE_H */
Attachment:
pgpjEzV12Ayj2.pgp
Description: PGP signature
