[Linuxconsole-commit]CVS: ruby/linux/include/linux serial_core.h,1.6,1.7

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/include/linux
In directory usw-pr-cvs1:/tmp/cvs-serv19105

Modified Files:
	serial_core.h 
Log Message:
Synced to Russell King's latest work.

Index: serial_core.h
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/include/linux/serial_core.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- serial_core.h	2001/07/29 18:24:13	1.6
+++ serial_core.h	2001/11/01 21:39:45	1.7
@@ -46,6 +46,7 @@
 #define PORT_AMBA	32
 #define PORT_CLPS711X	33
 #define PORT_SA1100	34
+#define PORT_UART00    35
 
 #ifdef __KERNEL__
 
@@ -53,6 +54,7 @@
 #include <linux/interrupt.h>
 #include <linux/circ_buf.h>
 #include <linux/serial.h>
+#include <linux/spinlock.h>
 
 struct uart_port;
 struct uart_info;
@@ -160,6 +162,7 @@
  * stuff here.
  */
 struct uart_info {
+	spinlock_t		lock;
 	struct uart_port	*port;
 	struct uart_ops		*ops;
 	struct uart_state	*state;