diff options
Diffstat (limited to 'include/linux/serial_core.h')
-rw-r--r-- | include/linux/serial_core.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index e3710d7e260..ec351005bf9 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h | |||
@@ -67,6 +67,9 @@ | |||
67 | /* Parisc type numbers. */ | 67 | /* Parisc type numbers. */ |
68 | #define PORT_MUX 48 | 68 | #define PORT_MUX 48 |
69 | 69 | ||
70 | /* Atmel AT91RM9200 SoC */ | ||
71 | #define PORT_AT91RM9200 49 | ||
72 | |||
70 | /* Macintosh Zilog type numbers */ | 73 | /* Macintosh Zilog type numbers */ |
71 | #define PORT_MAC_ZILOG 50 /* m68k : not yet implemented */ | 74 | #define PORT_MAC_ZILOG 50 /* m68k : not yet implemented */ |
72 | #define PORT_PMAC_ZILOG 51 | 75 | #define PORT_PMAC_ZILOG 51 |
@@ -133,6 +136,7 @@ | |||
133 | #include <linux/spinlock.h> | 136 | #include <linux/spinlock.h> |
134 | #include <linux/sched.h> | 137 | #include <linux/sched.h> |
135 | #include <linux/tty.h> | 138 | #include <linux/tty.h> |
139 | #include <linux/mutex.h> | ||
136 | 140 | ||
137 | struct uart_port; | 141 | struct uart_port; |
138 | struct uart_info; | 142 | struct uart_info; |
@@ -281,7 +285,7 @@ struct uart_state { | |||
281 | struct uart_info *info; | 285 | struct uart_info *info; |
282 | struct uart_port *port; | 286 | struct uart_port *port; |
283 | 287 | ||
284 | struct semaphore sem; | 288 | struct mutex mutex; |
285 | }; | 289 | }; |
286 | 290 | ||
287 | #define UART_XMIT_SIZE PAGE_SIZE | 291 | #define UART_XMIT_SIZE PAGE_SIZE |