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

2006-01-14 19:44:39 -08:00
parent 150a631fc5 7493a314cb
commit 650eec5e04
5 changed files with 57 additions and 47 deletions
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -136,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;
@@ -284,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