diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-03 15:12:29 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-03 15:12:29 -0500 |
| commit | fe4bfb30fe5788100a70c0ed96ddd8c6186eb9c4 (patch) | |
| tree | 054d3a37dd62db5f362947c306c12fc3a223571f /drivers/usb/Kconfig | |
| parent | 367576b813ed66a000e66ec18f7082bbc84c05d7 (diff) | |
| parent | e3e9887ee9de36d8e2bef972ad74a42abd7a44c4 (diff) | |
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 0f81b606cb13..6585f0b67801 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig | |||
| @@ -48,11 +48,6 @@ config USB_ARCH_HAS_OHCI | |||
| 48 | # MIPS: | 48 | # MIPS: |
| 49 | default y if MIPS_ALCHEMY | 49 | default y if MIPS_ALCHEMY |
| 50 | default y if MACH_JZ4740 | 50 | default y if MACH_JZ4740 |
| 51 | # SH: | ||
| 52 | default y if CPU_SUBTYPE_SH7720 | ||
| 53 | default y if CPU_SUBTYPE_SH7721 | ||
| 54 | default y if CPU_SUBTYPE_SH7763 | ||
| 55 | default y if CPU_SUBTYPE_SH7786 | ||
| 56 | # more: | 51 | # more: |
| 57 | default PCI | 52 | default PCI |
| 58 | 53 | ||