diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-06-24 10:53:30 +0200 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-06-24 10:53:30 +0200 |
commit | 89576a62b38d53c2080fa25472c85f86189c4557 (patch) | |
tree | c6f14b125627918b55e09b0ed81f8893f2374c21 /arch/sh | |
parent | sh: Tidy up pre-clkdev clk_get() error handling. (diff) | |
parent | sh: add to select the new configuration for USB EHCI/OHCI (diff) | |
download | linux-89576a62b38d53c2080fa25472c85f86189c4557.tar.xz linux-89576a62b38d53c2080fa25472c85f86189c4557.zip |
Merge branch 'sh/stable-updates' into sh-latest
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index f03338c2f088..df89ba5e104b 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -348,6 +348,7 @@ config CPU_SUBTYPE_SH7720 select SYS_SUPPORTS_CMT select ARCH_WANT_OPTIONAL_GPIOLIB select USB_ARCH_HAS_OHCI + select USB_OHCI_SH help Select SH7720 if you have a SH3-DSP SH7720 CPU. @@ -357,6 +358,7 @@ config CPU_SUBTYPE_SH7721 select CPU_HAS_DSP select SYS_SUPPORTS_CMT select USB_ARCH_HAS_OHCI + select USB_OHCI_SH help Select SH7721 if you have a SH3-DSP SH7721 CPU. @@ -440,6 +442,7 @@ config CPU_SUBTYPE_SH7763 bool "Support SH7763 processor" select CPU_SH4A select USB_ARCH_HAS_OHCI + select USB_OHCI_SH help Select SH7763 if you have a SH4A SH7763(R5S77631) CPU. @@ -467,7 +470,9 @@ config CPU_SUBTYPE_SH7786 select GENERIC_CLOCKEVENTS_BROADCAST if SMP select ARCH_WANT_OPTIONAL_GPIOLIB select USB_ARCH_HAS_OHCI + select USB_OHCI_SH select USB_ARCH_HAS_EHCI + select USB_EHCI_SH config CPU_SUBTYPE_SHX3 bool "Support SH-X3 processor" |