Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (97 commits)
  USB: qcserial: add device id for HP devices
  USB: isp1760: Add a delay before reading the SKIPMAP registers in isp1760-hcd.c
  USB: allow malformed LANGID descriptors
  USB: pxa27x_udc: typo fixes and code cleanups
  USB: gadget: gadget zero uses new suspend/resume hooks
  USB: gadget: composite device-level suspend/resume hooks
  USB: r8a66597-hcd: suspend/resume support
  USB: more u32 conversion after transfer_buffer_length and actual_length
  USB: Fix cp2101 USB serial device driver termios functions for console use
  USB: CP2101 New Device ID
  USB: ipaq: handle 4 endpoint devices
  USB: S3C: Move usb-control.h to platform include
  USB: ohci-hcd: Add ARCH_S3C24XX to the ohci-s3c2410.c glue
  USB: pedantic: spelling correction in comment for ch9.h
  USB: host: fix sparse warning: Using plain integer as NULL pointer
  USB: ohci-s3c2410: fix name of bus clock
  USB: ohci-s3c2410: remove <mach/hardware.h> include
  USB: serial: rename cp2101 driver to cp210x
  USB: CP2101 Reduce Error Logging
  USB: CP2101 Support AN205 baud rates
  ...

1 files changed, 0 insertions, 39 deletions

diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig
index e463db5d8188..a68d91a11bee 100644
--- a/drivers/usb/misc/Kconfig
+++ b/drivers/usb/misc/Kconfig
@@ -135,45 +135,6 @@ config USB_CYTHERM
           To compile this driver as a module, choose M here: the
           module will be called cytherm.
 
-config USB_PHIDGET
-        tristate "USB Phidgets drivers"
-        depends on USB
-        help
-          Say Y here to enable the various drivers for devices from
-          Phidgets inc.
-
-config USB_PHIDGETKIT
-        tristate "USB PhidgetInterfaceKit support"
-        depends on USB_PHIDGET
-        help
-          Say Y here if you want to connect a PhidgetInterfaceKit USB device
-          from Phidgets Inc.
-
-          To compile this driver as a module, choose M here: the
-          module will be called phidgetkit.
-
-config USB_PHIDGETMOTORCONTROL
-        tristate "USB PhidgetMotorControl support"
-        depends on USB_PHIDGET
-        help
-          Say Y here if you want to connect a PhidgetMotorControl USB device
-          from Phidgets Inc.
-
-          To compile this driver as a module, choose M here: the
-          module will be called phidgetmotorcontrol.
-
-config USB_PHIDGETSERVO
-        tristate "USB PhidgetServo support"
-        depends on USB_PHIDGET
-        help
-          Say Y here if you want to connect an 1 or 4 Motor PhidgetServo 
-          servo controller version 2.0 or 3.0.
-
-          Phidgets Inc. has a web page at <http://www.phidgets.com/>.
-
-          To compile this driver as a module, choose M here: the
-          module will be called phidgetservo.
-
 config USB_IDMOUSE
         tristate "Siemens ID USB Mouse Fingerprint sensor support"
         depends on USB