summaryrefslogtreecommitdiffstats
path: root/include/uapi
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-06-27 14:26:33 +0200
committerArnd Bergmann <arnd@arndb.de>2013-06-27 14:26:33 +0200
commit0ad578ef25be566aa80b28115c9d696e511bc6be (patch)
treeb9906c7536a92972c20950b08ced3c31c516546c /include/uapi
parent4022acdb5b2b65ad2fe078be39bda9c5377c4e04 (diff)
parentd4759ded3bdf3eb004d583011707fdc21aeda94e (diff)
downloadlinux-0ad578ef25be566aa80b28115c9d696e511bc6be.tar.bz2
Merge tag 'renesas-sh-sci-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/late
Renesas sh-sci updates for v3.11 HSCIF support by Ulrich Hecht. * tag 'renesas-sh-sci-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: serial: sh-sci: Initialise variables before access in sci_set_termios() ARM: shmobile: r8a7790: don't use external clock for SCIFs ARM: shmobile: r8a7790: HSCIF support serial: sh-sci: HSCIF support Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/uapi')
-rw-r--r--include/uapi/linux/serial_core.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/uapi/linux/serial_core.h b/include/uapi/linux/serial_core.h
index 74c2bf7211f8..26eee07eeb24 100644
--- a/include/uapi/linux/serial_core.h
+++ b/include/uapi/linux/serial_core.h
@@ -226,4 +226,7 @@
/* Rocketport EXPRESS/INFINITY */
#define PORT_RP2 102
+/* SH-SCI */
+#define PORT_HSCIF 103
+
#endif /* _UAPILINUX_SERIAL_CORE_H */