diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-03 12:12:29 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-03 12:12:29 -0800 |
commit | fe4bfb30fe5788100a70c0ed96ddd8c6186eb9c4 (patch) | |
tree | 054d3a37dd62db5f362947c306c12fc3a223571f /drivers/usb/Kconfig | |
parent | 367576b813ed66a000e66ec18f7082bbc84c05d7 (diff) | |
parent | e3e9887ee9de36d8e2bef972ad74a42abd7a44c4 (diff) | |
download | kernel_samsung_aries-fe4bfb30fe5788100a70c0ed96ddd8c6186eb9c4.zip kernel_samsung_aries-fe4bfb30fe5788100a70c0ed96ddd8c6186eb9c4.tar.gz kernel_samsung_aries-fe4bfb30fe5788100a70c0ed96ddd8c6186eb9c4.tar.bz2 |
Merge branch 'sh/ehci' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 into work
* 'sh/ehci' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Convert to USB_ARCH_HAS_OHCI/EHCI selects.
usb: ehci-sh: Add missing ehci helpers.
usb: ehci-sh: Fix up fault in shutdown path.
sh: Add EHCI support for SH7786.
usb: ehci-hcd: Add support for SuperH EHCI.
usb: ohci-sh: Set IRQ as shared.
Diffstat (limited to 'drivers/usb/Kconfig')
-rw-r--r-- | drivers/usb/Kconfig | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 0f81b60..6585f0b 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -48,11 +48,6 @@ config USB_ARCH_HAS_OHCI # MIPS: default y if MIPS_ALCHEMY default y if MACH_JZ4740 - # SH: - default y if CPU_SUBTYPE_SH7720 - default y if CPU_SUBTYPE_SH7721 - default y if CPU_SUBTYPE_SH7763 - default y if CPU_SUBTYPE_SH7786 # more: default PCI |