[Linuxconsole-commit]CVS: ruby/linux/include/linux tty.h,1.12,1.13 serial_core.h,1.13,NONE

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

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

Modified Files:
	tty.h 
Removed Files:
	serial_core.h 
Log Message:
bug fixes. Now it compiles.

Index: tty.h
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/include/linux/tty.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- tty.h	20 Jan 2002 03:54:46 -0000	1.12
+++ tty.h	5 Nov 2002 14:36:21 -0000	1.13
@@ -10,7 +10,7 @@
 #include <linux/fs.h>
 #include <linux/major.h>
 #include <linux/termios.h>
-#include <linux/tqueue.h>
+#include <linux/workqueue.h>
 #include <linux/tty_driver.h>
 #include <linux/tty_ldisc.h>
 
@@ -79,7 +79,8 @@
 	unsigned short vesapm_seg;		/* 0x2e */
 	unsigned short vesapm_off;		/* 0x30 */
 	unsigned short pages;			/* 0x32 */
-						/* 0x34 -- 0x3f reserved for future expansion */
+	unsigned short vesa_attributes;		/* 0x34 */
+						/* 0x36 -- 0x3f reserved for future expansion */
 };
 
 extern struct screen_info screen_info;
@@ -127,7 +128,7 @@
 #define TTY_FLIPBUF_SIZE 512
 
 struct tty_flip_buffer {
-	struct tq_struct tqueue;
+	struct work_struct		work;
 	struct semaphore pty_sem;
 	char		*char_buf_ptr;
 	unsigned char	*flag_buf_ptr;
@@ -268,7 +269,7 @@
 	int alt_speed;		/* For magic substitution of 38400 bps */
 	wait_queue_head_t write_wait;
 	wait_queue_head_t read_wait;
-	struct tq_struct tq_hangup;
+	struct work_struct hangup_work;
 	void *disc_data;
 	void *driver_data;
 	struct list_head tty_files;
@@ -298,7 +299,7 @@
 	struct semaphore atomic_write;
 	spinlock_t read_lock;
 	/* If the tty has a pending do_SAK, queue it here - akpm */
-        struct tq_struct SAK_tq;
+	struct work_struct SAK_work;
 };
 
 /* tty magic number */

--- serial_core.h DELETED ---