[Linux-mips-commits]CVS: linux/drivers/char Config.in,1.22,1.23 Makefile,1.17,1.18 au1000_gpio.c,1.3,1.4

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

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

Modified Files:
	Config.in Makefile au1000_gpio.c 
Log Message:
Removal of files duplicated in Linus tree.

Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/Config.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Config.in	2001/11/06 17:16:42	1.22
+++ Config.in	2001/11/06 20:23:55	1.23
@@ -62,9 +62,9 @@
    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
+     if [ "$CONFIG_AU1000_UART" = "y" ]; then
+         bool '        Enable Au1000 serial console' CONFIG_AU1000_SERIAL_CONSOLE
+     fi
 fi
 if [ "$CONFIG_EXPERIMENTAL" = "y" -a "$CONFIG_ZORRO" = "y" ]; then
    tristate 'Commodore A2232 serial support (EXPERIMENTAL)' CONFIG_A2232
@@ -81,9 +81,9 @@
 if [ "$CONFIG_MIPS_ITE8172" = "y" ]; then
    bool 'Enable Qtronix 990P Keyboard Support' CONFIG_QTRONIX_KEYBOARD
    if [ "$CONFIG_QTRONIX_KEYBOARD" = "y" ]; then
-      define_bool CONFIG_IT8172_CIR y
+     define_bool CONFIG_IT8172_CIR y
    else
-      bool '    Enable PS2 Keyboard Support' CONFIG_PC_KEYB
+     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

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/Makefile,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Makefile	2001/11/06 09:10:21	1.17
+++ Makefile	2001/11/06 20:23:55	1.18
@@ -240,8 +240,8 @@
 obj-$(CONFIG_977_WATCHDOG) += wdt977.o
 obj-$(CONFIG_I810_TCO) += i810-tco.o
 obj-$(CONFIG_MACHZ_WDT) += machzwd.o
-obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o
 obj-$(CONFIG_SH_WDT) += shwdt.o
+obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o
 obj-$(CONFIG_VR41XX_WDT) += vr41xxwdt.o
 
 subdir-$(CONFIG_MWAVE) += mwave

Index: au1000_gpio.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/au1000_gpio.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- au1000_gpio.c	2001/10/22 22:35:50	1.3
+++ au1000_gpio.c	2001/11/06 20:23:55	1.4
@@ -35,11 +35,11 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/miscdevice.h>
-#include <linux/au1000_gpio.h>
 #include <linux/init.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/au1000.h>
+#include <asm/au1000_gpio.h>
 
 #define VERSION "0.01"