Merge master.kernel.org:/home/rmk/linux-2.6-arm

[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 a3ac92b19acac8267ff5ec922e1bdfccd2b9ca06..a8187c3c8a7b0606d4358ba392997011ea73d04c 100644 (file)
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -67,6 +67,9 @@
 /* Parisc type numbers. */
 #define PORT_MUX       48
 
+/* Atmel AT91RM9200 SoC */
+#define PORT_AT91RM9200 49
+
 /* Macintosh Zilog type numbers */
 #define PORT_MAC_ZILOG 50      /* m68k : not yet implemented */
 #define PORT_PMAC_ZILOG        51
@@ -121,6 +124,9 @@
 
 #define PORT_IP3106    70
 
+/* Hilscher netx */
+#define PORT_NETX      71
+
 #ifdef __KERNEL__
 
 #include <linux/config.h>