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:
  USB: don't rebind drivers after failed resume or reset
  USB: fix memory leak in cdc-acm
  USB: Unusual dev for Mio moov 330 gps
  USB: cdc-wdm: make module autoload work
  USB: Fix unneeded endpoint check in pxa27x_udc
  usb/gadget: fix kernel-doc warning
  USB: Speedtouch: add pre_reset and post_reset routines
  USB: usbtest.c: length, sglen and vary are unsigned, so cannot be negative
  USB: support Huawei data card product IDs
  USB: add ZTE MF626 USB GSM modem entry
  USB: storage: Avoid I/O errors when issuing SCSI ioctls to JMicron USB/ATA bridge
  USB: Fix debugfs_create_file's error checking method for usb/gadget/s3c2410_udc
  USB: ohci: add support for tmio-ohci cell

diff --combined drivers/usb/Kconfig
index c23a9857ee674d988e8aba1e6e1dd74d0a5fe6ce,3be4730ebd2d562b59f2d527df0bf3911846e67f..289d81adfb9c7eae11bbbc5bec1a2b2c218bb901
--- 1/drivers/usb/Kconfig
--- 2/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@@ -36,7 -36,8 +36,8 @@@ config USB_ARCH_HAS_OHC
        default y if PXA3xx
        default y if ARCH_EP93XX
        default y if ARCH_AT91
-       default y if ARCH_PNX4008
+       default y if ARCH_PNX4008 && I2C
+       default y if MFD_TC6393XB
        # PPC:
        default y if STB03xxx
        default y if PPC_MPC52xx
@@@ -97,8 -98,6 +98,8 @@@ source "drivers/usb/core/Kconfig
  
  source "drivers/usb/mon/Kconfig"
  
 +source "drivers/usb/wusbcore/Kconfig"
 +
  source "drivers/usb/host/Kconfig"
  
  source "drivers/usb/musb/Kconfig"

diff --combined drivers/usb/host/Kconfig
index 72fb655e60338b8854905ebf8f99e1b174be92d4,ba1c77141b43ccba00853d7c402d1cdb7fc5d21c..56f592dc0b3626139f4e9b34dd191af967f30bf0
--- 1/drivers/usb/host/Kconfig
--- 2/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@@ -138,7 -138,6 +138,6 @@@ config USB_OHCI_HC
        tristate "OHCI HCD support"
        depends on USB && USB_ARCH_HAS_OHCI
        select ISP1301_OMAP if MACH_OMAP_H2 || MACH_OMAP_H3
-       select I2C if ARCH_PNX4008
        ---help---
          The Open Host Controller Interface (OHCI) is a standard for accessing
          USB 1.1 host controller hardware.  It does more in hardware than Intel's
@@@ -305,31 -304,3 +304,31 @@@ config SUPERH_ON_CHIP_R8A6659
        help
           This driver enables support for the on-chip R8A66597 in the
           SH7366 and SH7723 processors.
 +
 +config USB_WHCI_HCD
 +      tristate "Wireless USB Host Controller Interface (WHCI) driver (EXPERIMENTAL)"
 +      depends on EXPERIMENTAL
 +      depends on PCI && USB
 +      select USB_WUSB
 +      select UWB_WHCI
 +      help
 +        A driver for PCI-based Wireless USB Host Controllers that are
 +        compliant with the WHCI specification.
 +
 +        To compile this driver a module, choose M here: the module
 +        will be called "whci-hcd".
 +
 +config USB_HWA_HCD
 +      tristate "Host Wire Adapter (HWA) driver (EXPERIMENTAL)"
 +      depends on EXPERIMENTAL
 +      depends on USB
 +      select USB_WUSB
 +      select UWB_HWA
 +      help
 +        This driver enables you to connect Wireless USB devices to
 +        your system using a Host Wire Adaptor USB dongle. This is an
 +        UWB Radio Controller and WUSB Host Controller connected to
 +        your machine via USB (specified in WUSB1.0).
 +
 +        To compile this driver a module, choose M here: the module
 +        will be called "hwa-hc".