[Linuxconsole-commit]CVS: ruby/linux/drivers/usb/input Config.in,1.3,1.4 Makefile,1.2,1.3 hiddev.c,1.1,1.2

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

Update of /cvsroot/linuxconsole/ruby/linux/drivers/usb/input
In directory usw-pr-cvs1:/tmp/cvs-serv22497/linux/drivers/usb/input

Modified Files:
	Config.in Makefile hiddev.c 
Log Message:
Synced to 2.5.10

Index: Config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/usb/input/Config.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Config.in	23 Apr 2002 00:50:39 -0000	1.3
+++ Config.in	26 Apr 2002 17:23:40 -0000	1.4
@@ -20,13 +20,4 @@
 dep_mbool '  PID Devices' CONFIG_HID_PID $CONFIG_USB_HID $CONFIG_HID_FF
 
 dep_tristate '  Wacom Intuos/Graphire tablet support' CONFIG_USB_WACOM $CONFIG_USB $CONFIG_INPUT
-
-# Turn on CONFIG_USB_INPUT if any of the drivers are compiled into the kernel
-# to make our Makefile logic a bit simpler.
-if [ "$CONFIG_USB_HID" = "y" -o "$CONFIG_USB_KBD" = "y" -o "$CONFIG_USB_MOUSE" = "y" ]; then
-   define_bool CONFIG_USB_INPUT y
-fi
-if [ "$CONFIG_USB_WACOM" = "y" ]; then
-   define_bool CONFIG_USB_INPUT y
-fi
    

Index: Makefile
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/usb/input/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	18 Apr 2002 22:02:47 -0000	1.2
+++ Makefile	26 Apr 2002 17:23:40 -0000	1.3
@@ -2,7 +2,7 @@
 # Makefile for the USB input drivers
 #
 
-O_TARGET	:= usb-input.o
+O_TARGET	:= input.o
 
 # Multipart objects.
 hid-objs	:= hid-core.o

Index: hiddev.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/usb/input/hiddev.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hiddev.c	16 Apr 2002 17:41:51 -0000	1.1
+++ hiddev.c	26 Apr 2002 17:23:40 -0000	1.2
@@ -700,10 +700,11 @@
 
 
 static /* const */ struct usb_driver hiddev_driver = {
-	name:	"hiddev",
-	probe:	hiddev_usbd_probe,
-	fops:	&hiddev_fops,
-	minor:	HIDDEV_MINOR_BASE
+	name:		"hiddev",
+	probe:		hiddev_usbd_probe,
+	fops:		&hiddev_fops,
+	minor:		HIDDEV_MINOR_BASE,
+	num_minors:	HIDDEV_MINORS,
 };
 
 int __init hiddev_init(void)