diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 10:09:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 10:09:50 -0700 |
| commit | a27028349ccbcec9dde9d6dbba9d4017ad9ad5ab (patch) | |
| tree | 58d7deaeda91cf854543b8dfcef097097eb856fb /drivers/usb/Kconfig | |
| parent | 45432371b448c80622d8069b845625996127caeb (diff) | |
| parent | 6c6409459a18a825ce12ecb003d5686af61f7a2f (diff) | |
| download | blackbird-obmc-linux-a27028349ccbcec9dde9d6dbba9d4017ad9ad5ab.tar.gz blackbird-obmc-linux-a27028349ccbcec9dde9d6dbba9d4017ad9ad5ab.zip | |
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
Diffstat (limited to 'drivers/usb/Kconfig')
| -rw-r--r-- | drivers/usb/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index c23a9857ee67..289d81adfb9c 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -36,7 +36,8 @@ config USB_ARCH_HAS_OHCI 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 |
