Hi Simon,
Today's linux-next merge of the renesas tree got a conflict in
include/uapi/linux/serial_core.h between commit c9e2e946fb0b ("tty:
serial: add Freescale lpuart driver support") from the tty tree and
commit 24610a30600b ("serial: sh-sci: HSCIF support") from the renesas
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 c8eaeb5,26eee07..0000000
--- a/include/uapi/linux/serial_core.h
+++ b/include/uapi/linux/serial_core.h
@@@ -226,7 -226,7 +226,10 @@@
/* Rocketport EXPRESS/INFINITY */
#define PORT_RP2 102
+/* Freescale lpuart */
+#define PORT_LPUART 103
+
+ /* SH-SCI */
-#define PORT_HSCIF 103
++#define PORT_HSCIF 104
+
#endif /* _UAPILINUX_SERIAL_CORE_H */
Attachment:
pgpB_AnVRoahH.pgp
Description: PGP signature
