diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-16 13:05:06 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-16 13:05:06 -0500 |
| commit | 36facadd9ea98f8415d0dbb63e0763b7ee9d3911 (patch) | |
| tree | 99dea00b332ed852f2b0a4923b581dd723f03634 /arch/sh/Kconfig | |
| parent | 2faa83e2a519abea1055d156ce1b42b8fa57e87b (diff) | |
| parent | 0b83ae960cd7d4a5ee02786ecf41ab45688999bf (diff) | |
Merge branch 'usb-next' into musb-merge
* usb-next: (132 commits)
USB: uas: Use GFP_NOIO instead of GFP_KERNEL in I/O submission path
USB: uas: Ensure we only bind to a UAS interface
USB: uas: Rename sense pipe and sense urb to status pipe and status urb
USB: uas: Use kzalloc instead of kmalloc
USB: uas: Fix up the Sense IU
usb: musb: core: kill unneeded #include's
DA8xx: assign name to MUSB IRQ resource
usb: gadget: g_ncm added
usb: gadget: f_ncm.c added
usb: gadget: u_ether: prepare for NCM
usb: pch_udc: Fix setup transfers with data out
usb: pch_udc: Fix compile error, warnings and checkpatch warnings
usb: add ab8500 usb transceiver driver
USB: gadget: Implement runtime PM for MSM bus glue driver
USB: gadget: Implement runtime PM for ci13xxx gadget
USB: gadget: Add USB controller driver for MSM SoC
USB: gadget: Introduce ci13xxx_udc_driver struct
USB: gadget: Initialize ci13xxx gadget device's coherent DMA mask
USB: gadget: Fix "scheduling while atomic" bugs in ci13xxx_udc
USB: gadget: Separate out PCI bus code from ci13xxx_udc
...
Diffstat (limited to 'arch/sh/Kconfig')
| -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 2e9d78d21fd3..430e46788609 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
| @@ -346,6 +346,7 @@ config CPU_SUBTYPE_SH7720 | |||
| 346 | select CPU_SH3 | 346 | select CPU_SH3 |
| 347 | select CPU_HAS_DSP | 347 | select CPU_HAS_DSP |
| 348 | select SYS_SUPPORTS_CMT | 348 | select SYS_SUPPORTS_CMT |
| 349 | select USB_ARCH_HAS_OHCI | ||
| 349 | help | 350 | help |
| 350 | Select SH7720 if you have a SH3-DSP SH7720 CPU. | 351 | Select SH7720 if you have a SH3-DSP SH7720 CPU. |
| 351 | 352 | ||
| @@ -354,6 +355,7 @@ config CPU_SUBTYPE_SH7721 | |||
| 354 | select CPU_SH3 | 355 | select CPU_SH3 |
| 355 | select CPU_HAS_DSP | 356 | select CPU_HAS_DSP |
| 356 | select SYS_SUPPORTS_CMT | 357 | select SYS_SUPPORTS_CMT |
| 358 | select USB_ARCH_HAS_OHCI | ||
| 357 | help | 359 | help |
| 358 | Select SH7721 if you have a SH3-DSP SH7721 CPU. | 360 | Select SH7721 if you have a SH3-DSP SH7721 CPU. |
| 359 | 361 | ||
| @@ -431,6 +433,7 @@ config CPU_SUBTYPE_SH7757 | |||
| 431 | config CPU_SUBTYPE_SH7763 | 433 | config CPU_SUBTYPE_SH7763 |
| 432 | bool "Support SH7763 processor" | 434 | bool "Support SH7763 processor" |
| 433 | select CPU_SH4A | 435 | select CPU_SH4A |
| 436 | select USB_ARCH_HAS_OHCI | ||
| 434 | help | 437 | help |
| 435 | Select SH7763 if you have a SH4A SH7763(R5S77631) CPU. | 438 | Select SH7763 if you have a SH4A SH7763(R5S77631) CPU. |
| 436 | 439 | ||
| @@ -455,6 +458,8 @@ config CPU_SUBTYPE_SH7786 | |||
| 455 | select CPU_SHX3 | 458 | select CPU_SHX3 |
| 456 | select CPU_HAS_PTEAEX | 459 | select CPU_HAS_PTEAEX |
| 457 | select GENERIC_CLOCKEVENTS_BROADCAST if SMP | 460 | select GENERIC_CLOCKEVENTS_BROADCAST if SMP |
| 461 | select USB_ARCH_HAS_OHCI | ||
| 462 | select USB_ARCH_HAS_EHCI | ||
| 458 | 463 | ||
| 459 | config CPU_SUBTYPE_SHX3 | 464 | config CPU_SUBTYPE_SHX3 |
| 460 | bool "Support SH-X3 processor" | 465 | bool "Support SH-X3 processor" |