summaryrefslogtreecommitdiffstats
path: root/drivers/usb/musb/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-28 22:27:45 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-28 22:27:45 +0100
commit3fab191002b184e4390aa07c7149c6cc7b638ec7 (patch)
tree821382d49e47c19531bfc3bb9e1f8922486374d4 /drivers/usb/musb/Kconfig
parent93394a761d78503f11d05b1a7b23d5a9ccc8dad2 (diff)
parent7c730ccdc1188b97f5c8cb690906242c7ed75c22 (diff)
downloadblackbird-op-linux-3fab191002b184e4390aa07c7149c6cc7b638ec7.tar.gz
blackbird-op-linux-3fab191002b184e4390aa07c7149c6cc7b638ec7.zip
Merge branch 'linus' into x86/core
Diffstat (limited to 'drivers/usb/musb/Kconfig')
-rw-r--r--drivers/usb/musb/Kconfig6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
index 9985db08e7db..b66e8544d8b9 100644
--- a/drivers/usb/musb/Kconfig
+++ b/drivers/usb/musb/Kconfig
@@ -20,8 +20,8 @@ config USB_MUSB_HDRC
it's being used with, including the USB peripheral role,
or the USB host role, or both.
- Texas Instruments parts using this IP include DaVinci 644x,
- OMAP 243x, OMAP 343x, and TUSB 6010.
+ Texas Instruments familiies using this IP include DaVinci
+ (35x, 644x ...), OMAP 243x, OMAP 3, and TUSB 6010.
Analog Devices parts using this IP include Blackfin BF54x,
BF525 and BF527.
@@ -40,7 +40,7 @@ config USB_MUSB_SOC
default y if (BF54x && !BF544)
default y if (BF52x && !BF522 && !BF523)
-comment "DaVinci 644x USB support"
+comment "DaVinci 35x and 644x USB support"
depends on USB_MUSB_HDRC && ARCH_DAVINCI
comment "OMAP 243x high speed USB support"
OpenPOWER on IntegriCloud