[Linux-mips-commits]CVS: linux/drivers/char Config.in,1.31,1.32 serial_tx3912.c,1.9,1.10 keyboard.c,1.2,NONE tty_io.c,1.11,NONE

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

Update of /cvsroot/linux-mips/linux/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv17983/drivers/char

Modified Files:
	Config.in serial_tx3912.c 
Removed Files:
	keyboard.c tty_io.c 
Log Message:
Synced to 2.4.18

Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/Config.in,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- Config.in	26 Feb 2002 17:46:06 -0000	1.31
+++ Config.in	26 Feb 2002 19:03:29 -0000	1.32
@@ -206,9 +206,10 @@
    tristate '  SBC-60XX Watchdog Timer' CONFIG_60XX_WDT
    tristate '  W83877F (EMACS) Watchdog Timer' CONFIG_W83877F_WDT
    tristate '  ZF MachZ Watchdog' CONFIG_MACHZ_WDT
-   dep_tristate '  NEC VR41xx Watchdog (DSU)' CONFIG_VR41XX_WDT $CONFIG_CPU_VR41XX
    dep_tristate '  Indy/I2 Hardware Watchdog' CONFIG_INDYDOG $CONFIG_SGI_IP22	
 fi
+   dep_tristate '  NEC VR41xx Watchdog (DSU)' CONFIG_VR41XX_WDT $CONFIG_CPU_VR41XX
+fi
 endmenu
 
 if [ "$CONFIG_ARCH_NETWINDER" = "y" ]; then
@@ -264,7 +265,18 @@
    bool '  Serverworks LE/HE support' CONFIG_AGP_SWORKS
 fi
 
-source drivers/char/drm/Config.in
+bool 'Direct Rendering Manager (XFree86 DRI support)' CONFIG_DRM
+if [ "$CONFIG_DRM" = "y" ]; then
+   bool '  Build drivers for old (XFree 4.0) DRM' CONFIG_DRM_OLD
+   if [ "$CONFIG_DRM_OLD" = "y" ]; then
+      comment 'DRM 4.0 drivers'
+      source drivers/char/drm-4.0/Config.in
+   else
+      comment 'DRM 4.1 drivers'
+      define_bool CONFIG_DRM_NEW y
+      source drivers/char/drm/Config.in
+   fi
+fi
 
 if [ "$CONFIG_HOTPLUG" = "y" -a "$CONFIG_PCMCIA" != "n" ]; then
    source drivers/char/pcmcia/Config.in

Index: serial_tx3912.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/serial_tx3912.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serial_tx3912.c	2 Dec 2001 19:05:31 -0000	1.9
+++ serial_tx3912.c	26 Feb 2002 19:03:29 -0000	1.10
@@ -510,7 +510,7 @@
 		case TIOCGSERIAL:
 			if ((rc = verify_area(VERIFY_WRITE, (void *) arg,
 				sizeof(struct serial_struct))) == 0)
-				gs_getserial(&rs_port->gs, (struct serial_struct *) arg);
+				rc = gs_getserial(&rs_port->gs, (struct serial_struct *) arg);
 			break;
 		case TIOCSSERIAL:
 			if ((rc = verify_area(VERIFY_READ, (void *) arg,

--- keyboard.c DELETED ---

--- tty_io.c DELETED ---