Merge with /home/shaggy/git/linus-clean/

[karo-tx-linux.git] / include / linux / serial_core.h

diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 2b0401b93f2b81ae8d0ff52e4a42b67336452c7a..ec351005bf9d9ccb5c521a9048dfdcad7c2db57b 100644 (file)
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -39,8 +39,7 @@
 #define PORT_RSA       13
 #define PORT_NS16550A  14
 #define PORT_XSCALE    15
-#define PORT_IP3106    16
-#define PORT_MAX_8250  16      /* max port ID */
+#define PORT_MAX_8250  15      /* max port ID */
 
 /*
  * ARM specific type numbers.  These are not currently guaranteed
@@ -68,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
@@ -118,7 +120,12 @@
 #define PORT_M32R_SIO  68
 
 /*Digi jsm */
-#define PORT_JSM        65
+#define PORT_JSM        69
+
+#define PORT_IP3106    70
+
+/* Hilscher netx */
+#define PORT_NETX      71
 
 #ifdef __KERNEL__
 
@@ -129,6 +136,7 @@
 #include <linux/spinlock.h>
 #include <linux/sched.h>
 #include <linux/tty.h>
+#include <linux/mutex.h>
 
 struct uart_port;
 struct uart_info;
@@ -210,6 +218,7 @@ struct uart_port {
 #define UPIO_HUB6              (1)
 #define UPIO_MEM               (2)
 #define UPIO_MEM32             (3)
+#define UPIO_AU                        (4)                     /* Au1x00 type IO */
 
        unsigned int            read_status_mask;       /* driver specific */
        unsigned int            ignore_status_mask;     /* driver specific */
@@ -276,7 +285,7 @@ struct uart_state {
        struct uart_info        *info;
        struct uart_port        *port;
 
-       struct semaphore        sem;
+       struct mutex            mutex;
 };
 
 #define UART_XMIT_SIZE PAGE_SIZE