diff options
| author | Rabin Vincent <rabin@rab.in> | 2011-07-18 18:38:47 +0530 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2011-08-12 11:52:36 +0300 |
| commit | 26e5c3e227d15a44402e1c9ab817fe48142b4b99 (patch) | |
| tree | a0cee56f9d70175b9ab84f3dd62e951b01c60f74 | |
| parent | 74c6f3a42a5af424dd954916a5e69d00271b943a (diff) | |
| download | linux-stable-26e5c3e227d15a44402e1c9ab817fe48142b4b99.tar.gz linux-stable-26e5c3e227d15a44402e1c9ab817fe48142b4b99.tar.bz2 linux-stable-26e5c3e227d15a44402e1c9ab817fe48142b4b99.zip | |
usb: musb: fix Kconfig
After 622859634 (usb: musb: drop a gigantic amount of ifdeferry):
- USB_GADGET_MUSB_HDRC is no longer selectable because it
depends on the removed USB_MUSB_PERIPHERAL and USB_MUSB_OTG
options
- The Kconfig comment still says "Enable Host or Gadget support
to see Inventra options", even though you now need to enable
both of them to see Inventra options.
Fix the dependency and drop the anyway unnecessary comment.
Signed-off-by: Rabin Vincent <rabin@rab.in>
Signed-off-by: Felipe Balbi <balbi@ti.com>
| -rw-r--r-- | drivers/usb/gadget/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/usb/musb/Kconfig | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index 44b6b40aafb4..5a084b9cfa3c 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -310,7 +310,7 @@ config USB_PXA_U2O # musb builds in ../musb along with host support config USB_GADGET_MUSB_HDRC tristate "Inventra HDRC USB Peripheral (TI, ADI, ...)" - depends on USB_MUSB_HDRC && (USB_MUSB_PERIPHERAL || USB_MUSB_OTG) + depends on USB_MUSB_HDRC select USB_GADGET_DUALSPEED help This OTG-capable silicon IP is used in dual designs including diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig index 6192b45959f4..fc34b8b11910 100644 --- a/drivers/usb/musb/Kconfig +++ b/drivers/usb/musb/Kconfig @@ -3,9 +3,6 @@ # for silicon based on Mentor Graphics INVENTRA designs # -comment "Enable Host or Gadget support to see Inventra options" - depends on !USB && USB_GADGET=n - # (M)HDRC = (Multipoint) Highspeed Dual-Role Controller config USB_MUSB_HDRC depends on USB && USB_GADGET |