Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[linux-2.6-omap-h63xx.git] / include / linux / serial_core.h

diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 9963f81fea9a080e63b4093023ff7ad98f23a5ac..289942fc66553e0188c0ad70e4f6dc23be2922e1 100644 (file)
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -149,6 +149,12 @@
 /* Freescale ColdFire */
 #define PORT_MCF       78
 
+#define PORT_SC26XX    79
+
+
+/* MN10300 on-chip UART numbers */
+#define PORT_MN10300           80
+#define PORT_MN10300_CTS       81
 
 #ifdef __KERNEL__