diff options
author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
---|---|---|
committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/usb/otg/Kconfig | |
parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/usb/otg/Kconfig')
-rw-r--r-- | drivers/usb/otg/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/usb/otg/Kconfig b/drivers/usb/otg/Kconfig index aa884d072f0b..3d2d3e549bd1 100644 --- a/drivers/usb/otg/Kconfig +++ b/drivers/usb/otg/Kconfig | |||
@@ -41,6 +41,16 @@ config ISP1301_OMAP | |||
41 | This driver can also be built as a module. If so, the module | 41 | This driver can also be built as a module. If so, the module |
42 | will be called isp1301_omap. | 42 | will be called isp1301_omap. |
43 | 43 | ||
44 | config USB_ULPI | ||
45 | bool "Generic ULPI Transceiver Driver" | ||
46 | depends on ARM | ||
47 | select USB_OTG_UTILS | ||
48 | help | ||
49 | Enable this to support ULPI connected USB OTG transceivers which | ||
50 | are likely found on embedded boards. | ||
51 | |||
52 | The only chip currently supported is NXP's ISP1504 | ||
53 | |||
44 | config TWL4030_USB | 54 | config TWL4030_USB |
45 | tristate "TWL4030 USB Transceiver Driver" | 55 | tristate "TWL4030 USB Transceiver Driver" |
46 | depends on TWL4030_CORE && REGULATOR_TWL4030 | 56 | depends on TWL4030_CORE && REGULATOR_TWL4030 |