# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.309 -> 1.310 # drivers/usb/Config.in 1.18 -> 1.19 # drivers/usb/Makefile 1.16 -> 1.17 # Documentation/Configure.help 1.86 -> 1.87 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 02/04/02 greg@kroah.com 1.310 # USB # # Configure.help, Config.in, and Makefile update for all of the recent changes # -------------------------------------------- # diff -Nru a/Documentation/Configure.help b/Documentation/Configure.help --- a/Documentation/Configure.help Wed Apr 3 10:48:16 2002 +++ b/Documentation/Configure.help Wed Apr 3 10:48:17 2002 @@ -12815,18 +12815,6 @@ of debug messages to the system log. Select this if you are having a problem with USB support and want to see more of what is going on. -USB fetch large config -CONFIG_USB_LARGE_CONFIG - This option changes the initial request for a config descriptor so - that some poorly designed devices will still work. Some APC UPSes - need it. Basically, the usb subsystem sends a request for a short - (8 byte) config, just to find out how large the real config is. - Incorrectly implemented devices may choke on this small config - request. This option make the initial request for a quite large - config (1009 bytes), and things just work. - - If you have an APC UPS, say Y; otherwise say N. - USB long timeout for slow-responding devices (some MGE Ellipse UPSes) CONFIG_USB_LONG_TIMEOUT This option makes the standard time out a bit longer. Basically, @@ -12922,9 +12910,13 @@ CONFIG_USB_HID Say Y here if you want full HID support to connect keyboards, mice, joysticks, graphic tablets, or any other HID based devices - to your computer via USB. You can't use this driver and the - HIDBP (Boot Protocol) keyboard and mouse drivers at the same time. - More information is available: . + to your computer via USB. You also need to select HID Input layer + support (below) if you want to use keyboards, mice, joysticks and + the like. + + You can't use this driver and the HIDBP (Boot Protocol) keyboard + and mouse drivers at the same time. More information is available: + . If unsure, say Y. @@ -12933,6 +12925,14 @@ The module will be called hid.o. If you want to compile it as a module, say M here and read . +USB HID Input layer support +CONFIG_USB_HIDINPUT + Say Y here if you want to use a USB keyboard, mouse or joystick, + or any other HID input device. You also need Input layer support, + (CONFIG_INPUT) which you select under "Input core support". + + If unsure, say Y. + /dev/usb/hiddev raw HID device support CONFIG_USB_HIDDEV Say Y here if you want to support HID devices (from the USB @@ -12943,33 +12943,37 @@ event interface on /dev/usb/hiddevX (char 180:96 to 180:111). This driver requires CONFIG_USB_HID. - If unsure, say N. + If unsure, say Y. USB HIDBP Keyboard (basic) support CONFIG_USB_KBD - Say Y here if you don't want to use the generic HID driver for your - USB keyboard and prefer to use the keyboard in its limited Boot - Protocol mode instead. This driver is much smaller than the HID one. + Say Y here only if you are absolutely sure that you don't want + to use the generic HID driver for your USB keyboard and prefer + to use the keyboard in its limited Boot Protocol mode instead. + + This is almost certainly not what you want. This code is also available as a module ( = code which can be inserted in and removed from the running kernel whenever you want). The module will be called usbkbd.o. If you want to compile it as a module, say M here and read . - If unsure, say N. + If even remotely unsure, say N. USB HIDBP Mouse (basic) support CONFIG_USB_MOUSE - Say Y here if you don't want to use the generic HID driver for your - USB mouse and prefer to use the mouse in its limited Boot Protocol - mode instead. This driver is much smaller than the HID one. + Say Y here only if you are absolutely sure that you don't want + to use the generic HID driver for your USB keyboard and prefer + to use the keyboard in its limited Boot Protocol mode instead. + + This is almost certainly not what you want. This code is also available as a module ( = code which can be inserted in and removed from the running kernel whenever you want). The module will be called usbmouse.o. If you want to compile it as a module, say M here and read . - If unsure, say N. + If even remotely unsure, say N. Wacom Intuos/Graphire tablet support CONFIG_USB_WACOM @@ -13475,6 +13479,7 @@ * Motorola (DM100 and SB4100) * Broadcom Cable Modem (reference design) * Toshiba PCX1100U and possibly other cable modems + * Sharp Zaurus SL-5000D The device creates a network device (ethX, where X depends on what other networking devices you have in use), as for a normal PCI @@ -13574,10 +13579,21 @@ If your particular adapter is not in the list and you are _sure_ it is Pegasus or Pegasus-II based then send me (pmanolov@users.sourceforge.net) vendor and device IDs. - + This code is also available as a module ( = code which can be inserted in and removed from the running kernel whenever you want). The module will be called pegasus.o. If you want to compile it as a + module, say M here and read . + +Realtek RTL8150 based USB-Ethernet device support +CONFIG_USB_RTL8150 + Say Y here if you have RTL8150 based usb-ethernet adapter. + Send me (petkan@users.sourceforge.net) any comments you may have. + You can also check for updates at http://pegasus2.sourceforge.net/ + + This code is also available as a module ( = code which can be + inserted in and removed from the running kernel whenever you want). + The module will be called rtl8150.o. If you want to compile it as a module, say M here and read . USB KLSI KL5USB101-based Ethernet device support diff -Nru a/drivers/usb/Config.in b/drivers/usb/Config.in --- a/drivers/usb/Config.in Wed Apr 3 10:48:16 2002 +++ b/drivers/usb/Config.in Wed Apr 3 10:48:16 2002 @@ -49,17 +49,17 @@ dep_tristate ' USB Printer support' CONFIG_USB_PRINTER $CONFIG_USB comment 'USB Human Interface Devices (HID)' + dep_tristate ' USB Human Interface Device (full HID) support' CONFIG_USB_HID $CONFIG_USB 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 - dep_mbool ' /dev/hiddev raw HID device support (EXPERIMENTAL)' CONFIG_USB_HIDDEV $CONFIG_USB_HID - 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 + comment ' Input core support is needed for USB HID input layer or HIDBP support' + fi + dep_mbool ' HID input layer support' CONFIG_USB_HIDINPUT $CONFIG_INPUT $CONFIG_USB_HID + dep_mbool ' /dev/hiddev raw HID device support' CONFIG_USB_HIDDEV $CONFIG_USB_HID + 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 comment 'USB Imaging devices' dep_tristate ' USB Kodak DC-2xx Camera support' CONFIG_USB_DC2XX $CONFIG_USB @@ -87,6 +87,7 @@ comment ' Networking support is needed for USB Networking device support' else dep_tristate ' USB Pegasus/Pegasus-II based ethernet device support (EXPERIMENTAL)' CONFIG_USB_PEGASUS $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL + dep_tristate ' USB Realtek RTL8150 based ethernet device support (EXPERIMENTAL)' CONFIG_USB_RTL8150 $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL dep_tristate ' USB KLSI KL5USB101-based ethernet device support (EXPERIMENTAL)' CONFIG_USB_KAWETH $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL dep_tristate ' USB CATC NetMate-based Ethernet device support (EXPERIMENTAL)' CONFIG_USB_CATC $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL dep_tristate ' USB Communication Class Ethernet device support (EXPERIMENTAL)' CONFIG_USB_CDCETHER $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL diff -Nru a/drivers/usb/Makefile b/drivers/usb/Makefile --- a/drivers/usb/Makefile Wed Apr 3 10:48:16 2002 +++ b/drivers/usb/Makefile Wed Apr 3 10:48:16 2002 @@ -16,7 +16,7 @@ list-multi := usbcore.o hid.o pwc.o usbcore-objs := usb.o usb-debug.o hub.o -hid-objs := hid-core.o hid-input.o +hid-objs := hid-core.o pwc-objs := pwc-if.o pwc-misc.o pwc-ctrl.o pwc-uncompress.o @@ -30,6 +30,10 @@ hid-objs += hiddev.o endif +ifeq ($(CONFIG_USB_HIDINPUT),y) + hid-objs += hid-input.o +endif + # Object file lists. obj-y := @@ -77,6 +81,7 @@ obj-$(CONFIG_USB_SE401) += se401.o obj-$(CONFIG_USB_STV680) += stv680.o obj-$(CONFIG_USB_PEGASUS) += pegasus.o +obj-$(CONFIG_USB_RTL8150) += rtl8150.o obj-$(CONFIG_USB_CATC) += catc.o obj-$(CONFIG_USB_KAWETH) += kaweth.o obj-$(CONFIG_USB_CDCETHER) += CDCEther.o