[Linux-mips-commits]CVS: linux/drivers/char Config.in,1.10,1.11 dummy_keyb.c,1.2,1.3 serial_tx3912.c,1.3,1.4

[Paul M. <le...@us...>]

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

Modified Files:
	Config.in dummy_keyb.c serial_tx3912.c 
Log Message:
Further syncing with OSS 2.4.10. Massive restructuring of TLB handling.



Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/Config.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Config.in	2001/10/19 21:19:38	1.10
+++ Config.in	2001/10/22 19:16:45	1.11
@@ -82,6 +82,24 @@
       fi
       bool '  Console on DC21285 serial port' CONFIG_SERIAL_21285_CONSOLE
    fi
+   if [ "$CONFIG_MIPS" = "y" ]; then
+     bool '  TMPTX3912/PR31700 serial port support' CONFIG_SERIAL_TX3912
+     dep_bool '     Console on TMPTX3912/PR31700 serial port' CONFIG_SERIAL_TX3912_CONSOLE $CONFIG_SERIAL_TX3912
+     bool '  Enable Au1000 UART Support' CONFIG_AU1000_UART
+     if [ "$CONFIG_AU1000_UART" = "y" ]; then
+         bool '        Enable Au1000 serial console' CONFIG_AU1000_SERIAL_CONSOLE
+     fi
+   fi
+fi
+if [ "$CONFIG_IT8712" = "y" ]; then
+   bool 'Enable Qtronix 990P Keyboard Support' CONFIG_QTRONIX_KEYBOARD
+   if [ "$CONFIG_QTRONIX_KEYBOARD" = "y" ]; then
+     define_bool CONFIG_IT8172_CIR y
+   else
+     bool '    Enable PS2 Keyboard Support' CONFIG_PC_KEYB
+   fi
+   bool 'Enable Smart Card Reader 0 Support ' CONFIG_IT8172_SCR0
+   bool 'Enable Smart Card Reader 1 Support ' CONFIG_IT8172_SCR1
 fi
 bool 'Unix98 PTY support' CONFIG_UNIX98_PTYS
 if [ "$CONFIG_UNIX98_PTYS" = "y" ]; then

Index: dummy_keyb.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/dummy_keyb.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dummy_keyb.c	2001/09/25 03:47:07	1.2
+++ dummy_keyb.c	2001/10/22 19:16:45	1.3
@@ -31,11 +31,6 @@
 {
 }
 
-int kbd_rate(struct kbd_repeat *rep)
-{
-	return 0;
-}
-
 int kbd_setkeycode(unsigned int scancode, unsigned int keycode)
 {
 	return (scancode == keycode) ? 0 : -EINVAL;

Index: serial_tx3912.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/serial_tx3912.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serial_tx3912.c	2001/09/15 08:20:47	1.3
+++ serial_tx3912.c	2001/10/22 19:16:45	1.4
@@ -18,7 +18,6 @@
 #include <linux/ptrace.h>
 #include <linux/init.h>
 #include <linux/console.h>
-#include <linux/serial.h>
 #include <linux/fs.h>
 #include <linux/mm.h>
 #include <linux/malloc.h>