diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-08 09:24:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-08 09:24:01 -0700 |
| commit | 622f8061a68d3f7a576c20a47b7f3bae7c8cfbef (patch) | |
| tree | b9fa9f4d92d80eaae27f5a6f6cb2ff8b5d007024 /drivers/usb | |
| parent | 6c96895e999f5c44a95a5cad6a6e32e7bd6e28b6 (diff) | |
| parent | dd4da3a55f99efbfd46674ebefdcc2878a57ef2a (diff) | |
| download | kernel-crypto-622f8061a68d3f7a576c20a47b7f3bae7c8cfbef.tar.gz kernel-crypto-622f8061a68d3f7a576c20a47b7f3bae7c8cfbef.tar.xz kernel-crypto-622f8061a68d3f7a576c20a47b7f3bae7c8cfbef.zip | |
Merge branch 'sh/for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh/for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
serial: sh-sci: fix sci interrupt handler
video: hitfb: Move over to dev_pm_ops.
video: hitfb: Convert to framebuffer_alloc().
video: sh_mobile_lcdcfb: Convert to framebuffer_alloc().
sh: add r8a66597 usb0 host to the se7724 board
usb: allow sh7724 to enable on-chip r8a66597
sh-sci: update receive error handling for muxed irqs
sh: define PERF_COUNTER_INDEX_OFFSET.
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/host/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 1576a0520ad..0c03471f0d4 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -337,10 +337,10 @@ config USB_R8A66597_HCD config SUPERH_ON_CHIP_R8A66597 boolean "Enable SuperH on-chip R8A66597 USB" - depends on USB_R8A66597_HCD && (CPU_SUBTYPE_SH7366 || CPU_SUBTYPE_SH7723) + depends on USB_R8A66597_HCD && (CPU_SUBTYPE_SH7366 || CPU_SUBTYPE_SH7723 || CPU_SUBTYPE_SH7724) help This driver enables support for the on-chip R8A66597 in the - SH7366 and SH7723 processors. + SH7366, SH7723 and SH7724 processors. config USB_WHCI_HCD tristate "Wireless USB Host Controller Interface (WHCI) driver (EXPERIMENTAL)" |