summaryrefslogtreecommitdiffstats
path: root/drivers/usb/musb/Kconfig
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2011-08-02 01:41:16 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-08-02 01:41:31 +0200
commitacab460b0f618e1e9663eea8c52ad5edd552ed1d (patch)
treec139f945e7a05ab3a12ced855453f8f48762d84e /drivers/usb/musb/Kconfig
parentMerge branch 'for-usb-linus' of git+ssh://master.kernel.org/pub/scm/linux/ker... (diff)
parentusb: musb: fix oops on musb_gadget_pullup (diff)
downloadlinux-acab460b0f618e1e9663eea8c52ad5edd552ed1d.tar.xz
linux-acab460b0f618e1e9663eea8c52ad5edd552ed1d.zip
Merge branch 'for-greg' of master.kernel.org:/pub/scm/linux/kernel/git/balbi/usb into usb-linus
* 'for-greg' of master.kernel.org:/pub/scm/linux/kernel/git/balbi/usb: usb: musb: fix oops on musb_gadget_pullup usb: host: ehci-omap: fix .remove and failure handling path of .probe(v1) usb: gadget: hid: don't STALL when processing a HID Descriptor request usb: musb: fix Kconfig usb: musb: tusb6010_omap: fix build failure: error: 'musb' undeclared usb: gadget: composite: fix bMaxPacketSize for SuperSpeed usb: gadget: fusb300: remove #if 0 block usb: gadget: s3c2410_udc: fix unterminated platform_device_id table
Diffstat (limited to 'drivers/usb/musb/Kconfig')
-rw-r--r--drivers/usb/musb/Kconfig3
1 files changed, 0 insertions, 3 deletions
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