Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...

[linux-2.6] / include / linux / serial_core.h

diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 7cb094a82456cbe7a6c3409013bf98d16dd9a827..d32123ae08adbc9a7ed70613c97be128d0bb5c15 100644 (file)
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -149,13 +149,15 @@
 /* Freescale ColdFire */
 #define PORT_MCF       78
 
-#define PORT_SC26XX    79
-
+/* Blackfin SPORT */
+#define PORT_BFIN_SPORT                79
 
 /* MN10300 on-chip UART numbers */
 #define PORT_MN10300           80
 #define PORT_MN10300_CTS       81
 
+#define PORT_SC26XX    82
+
 #ifdef __KERNEL__
 
 #include <linux/compiler.h>