diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-19 14:50:26 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-19 14:50:38 +0200 |
| commit | 50ee9339c7347c2b16fa79d43777f72e9f41ef5a (patch) | |
| tree | ce09aa147e5c8bb74c72c46cebfdbffeece6678f /drivers/usb/Kconfig | |
| parent | Linux 2.6.39-rc4 (diff) | |
| parent | Revert "usb: usb_storage: do not align length of request for CBW to maxp size" (diff) | |
| download | linux-50ee9339c7347c2b16fa79d43777f72e9f41ef5a.tar.xz linux-50ee9339c7347c2b16fa79d43777f72e9f41ef5a.zip | |
Merge 2.6.39-rc4 into usb-next
This is needed to help resolve some xhci issues and other minor
differences.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/Kconfig')
| -rw-r--r-- | drivers/usb/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 006489d82dc3..a1b3750cadb3 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -65,6 +65,7 @@ config USB_ARCH_HAS_EHCI default y if ARCH_CNS3XXX default y if ARCH_VT8500 default y if PLAT_SPEAR + default y if PLAT_S5P default y if ARCH_MSM default y if MICROBLAZE default PCI @@ -116,6 +117,8 @@ source "drivers/usb/host/Kconfig" source "drivers/usb/musb/Kconfig" +source "drivers/usb/renesas_usbhs/Kconfig" + source "drivers/usb/class/Kconfig" source "drivers/usb/storage/Kconfig" |