[PATCH] USB Config fix for 2.2.19-pre7

From: Greg KH <greg@kroah.com>
To: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: f5ibh <f5ibh@db0bm.ampr.org>,
	linux-kernel@vger.kernel.org,
	linux-usb-devel@lists.sourceforge.net
Subject: [PATCH] USB Config fix for 2.2.19-pre7
Date: Wed, 10 Jan 2001 16:44:51 -0800	[thread overview]
Message-ID: <20010110164451.A16985@kroah.com> (raw)
In-Reply-To: <20010110002639.B26680@wirex.com>; from greg@wirex.com on Wed, Jan 10, 2001 at 12:26:39AM -0800

[-- Attachment #1: Type: text/plain, Size: 184 bytes --]

Hi,

Here's a fix for the USB Config for 2.2.19-pre7.  I messed up and took
out the HID devices in the patch I sent you for 2.2.19-pre6.

thanks,

greg k-h

-- 
greg@(kroah|wirex).com

[-- Attachment #2: usb-Config-2.2.19-pre7.diff --]
[-- Type: text/plain, Size: 2230 bytes --]

diff -Naur -X dontdiff linux-2.2.19-pre7/drivers/usb/Config.in linux-2.2.19-pre7-greg/drivers/usb/Config.in

--- linux-2.2.19-pre7/drivers/usb/Config.in	Wed Jan 10 15:43:28 2001
+++ linux-2.2.19-pre7-greg/drivers/usb/Config.in	Wed Jan 10 16:14:04 2001
@@ -36,16 +36,23 @@
    dep_tristate '  USB Printer support' CONFIG_USB_PRINTER $CONFIG_USB
 
    comment 'USB Human Interface Devices (HID)'
-   if [ "$CONFIG_INPUT" = "n" ]; then
-      comment '  Input core support is needed for USB HID'
-   else
-      dep_tristate '  USB Human Interface Device (full HID) support' CONFIG_USB_HID $CONFIG_USB $CONFIG_INPUT
-      if [ "$CONFIG_USB_HID" != "y" ]; then
-         dep_tristate '  USB HIDBP Keyboard (basic) support' CONFIG_USB_KBD $CONFIG_USB $CONFIG_INPUT
-         dep_tristate '  USB HIDBP Mouse (basic) support' CONFIG_USB_MOUSE $CONFIG_USB $CONFIG_INPUT
-      fi
-      dep_tristate '  Wacom Intuos/Graphire tablet support' CONFIG_USB_WACOM $CONFIG_USB $CONFIG_INPUT
+   dep_tristate '  USB Human Interface Device (full HID) support' CONFIG_USB_HID $CONFIG_USB
+   if [ "$CONFIG_USB_HID" != "y" ]; then
+      dep_tristate '  USB HIDBP Keyboard (basic) support' CONFIG_USB_KBD $CONFIG_USB
+      dep_tristate '  USB HIDBP Mouse (basic) support' CONFIG_USB_MOUSE $CONFIG_USB
    fi
+   if [ "$CONFIG_VT" = "y" ]; then
+      dep_tristate '  Keyboard support' CONFIG_INPUT_KEYBDEV $CONFIG_USB $CONFIG_USB_HID
+   fi
+   dep_tristate '  Mouse support' CONFIG_INPUT_MOUSEDEV $CONFIG_USB $CONFIG_USB_HID
+   if [ "$CONFIG_INPUT_MOUSEDEV" != "n" ]; then
+      int '   Horizontal screen resolution' CONFIG_INPUT_MOUSEDEV_SCREEN_X 1024
+      int '   Vertical screen resolution' CONFIG_INPUT_MOUSEDEV_SCREEN_Y 768
+   fi
+   dep_tristate '  Joystick support' CONFIG_INPUT_JOYDEV $CONFIG_USB $CONFIG_USB_HID
+   dep_tristate '  Logitech WingMan Force joystick support' CONFIG_USB_WMFORCE $CONFIG_USB $CONFIG_USB_HID
+   dep_tristate '  Wacom Intuos/Graphire tablet support' CONFIG_USB_WACOM $CONFIG_USB $CONFIG_USB_HID
+   dep_tristate '  Event interface support' CONFIG_INPUT_EVDEV $CONFIG_USB $CONFIG_USB_HID
 
    comment 'USB Imaging devices'
    dep_tristate '  USB Kodak DC-2xx Camera support' CONFIG_USB_DC2XX $CONFIG_USB
