diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-06-24 04:53:30 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-06-24 04:53:30 -0400 |
commit | 89576a62b38d53c2080fa25472c85f86189c4557 (patch) | |
tree | c6f14b125627918b55e09b0ed81f8893f2374c21 /arch/sh | |
parent | 7912825d8b755e6a5b9839eab910f451b0271aba (diff) | |
parent | 6935d131dec9a85afe80512b5a12541592802e48 (diff) |
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 | |||
348 | select SYS_SUPPORTS_CMT | 348 | select SYS_SUPPORTS_CMT |
349 | select ARCH_WANT_OPTIONAL_GPIOLIB | 349 | select ARCH_WANT_OPTIONAL_GPIOLIB |
350 | select USB_ARCH_HAS_OHCI | 350 | select USB_ARCH_HAS_OHCI |
351 | select USB_OHCI_SH | ||
351 | help | 352 | help |
352 | Select SH7720 if you have a SH3-DSP SH7720 CPU. | 353 | Select SH7720 if you have a SH3-DSP SH7720 CPU. |
353 | 354 | ||
@@ -357,6 +358,7 @@ config CPU_SUBTYPE_SH7721 | |||
357 | select CPU_HAS_DSP | 358 | select CPU_HAS_DSP |
358 | select SYS_SUPPORTS_CMT | 359 | select SYS_SUPPORTS_CMT |
359 | select USB_ARCH_HAS_OHCI | 360 | select USB_ARCH_HAS_OHCI |
361 | select USB_OHCI_SH | ||
360 | help | 362 | help |
361 | Select SH7721 if you have a SH3-DSP SH7721 CPU. | 363 | Select SH7721 if you have a SH3-DSP SH7721 CPU. |
362 | 364 | ||
@@ -440,6 +442,7 @@ config CPU_SUBTYPE_SH7763 | |||
440 | bool "Support SH7763 processor" | 442 | bool "Support SH7763 processor" |
441 | select CPU_SH4A | 443 | select CPU_SH4A |
442 | select USB_ARCH_HAS_OHCI | 444 | select USB_ARCH_HAS_OHCI |
445 | select USB_OHCI_SH | ||
443 | help | 446 | help |
444 | Select SH7763 if you have a SH4A SH7763(R5S77631) CPU. | 447 | Select SH7763 if you have a SH4A SH7763(R5S77631) CPU. |
445 | 448 | ||
@@ -467,7 +470,9 @@ config CPU_SUBTYPE_SH7786 | |||
467 | select GENERIC_CLOCKEVENTS_BROADCAST if SMP | 470 | select GENERIC_CLOCKEVENTS_BROADCAST if SMP |
468 | select ARCH_WANT_OPTIONAL_GPIOLIB | 471 | select ARCH_WANT_OPTIONAL_GPIOLIB |
469 | select USB_ARCH_HAS_OHCI | 472 | select USB_ARCH_HAS_OHCI |
473 | select USB_OHCI_SH | ||
470 | select USB_ARCH_HAS_EHCI | 474 | select USB_ARCH_HAS_EHCI |
475 | select USB_EHCI_SH | ||
471 | 476 | ||
472 | config CPU_SUBTYPE_SHX3 | 477 | config CPU_SUBTYPE_SHX3 |
473 | bool "Support SH-X3 processor" | 478 | bool "Support SH-X3 processor" |