aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-14 19:44:39 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-14 19:44:39 -0800
commit650eec5e04468d0611a60e6098464b7c43981552 (patch)
treededaf6f64ced34391a085f8c1148c1cf9f593ea6 /include/linux
parent150a631fc55e33df28a6846371e7f86e9e75e8cb (diff)
parent7493a314cb83797ce612a577475aacaedc553fed (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/serial_core.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index a8187c3c8a7..ec351005bf9 100644
--- 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