diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-03-17 19:46:58 (GMT) |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-03-17 19:48:06 (GMT) |
| commit | 2dd22997679a88874c131f6e6ffb963e6d43b3a6 (patch) | |
| tree | bfe1707dda7e755b8b550c6796e2649813bcfbb9 /drivers/usb/gadget/Kconfig | |
| parent | 36885ff0e6563687e6152da6d311abbf83c0198f (diff) | |
| parent | 7b7adc4a016a1decb806eb71ecab98721fa7f146 (diff) | |
| download | linux-fsl-qoriq-2dd22997679a88874c131f6e6ffb963e6d43b3a6.tar.xz | |
Merge remote-tracking branch 'origin' into spi/next
Pull in Linus' tree to pick up changes required for the langwell gpio fixes
Diffstat (limited to 'drivers/usb/gadget/Kconfig')
| -rw-r--r-- | drivers/usb/gadget/Kconfig | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index d500996..bc5123c 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -176,15 +176,15 @@ config USB_FSL_USB2 default USB_GADGET select USB_GADGET_SELECTED -config USB_GADGET_LH7A40X - boolean "LH7A40X" - depends on ARCH_LH7A40X +config USB_GADGET_FUSB300 + boolean "Faraday FUSB300 USB Peripheral Controller" + select USB_GADGET_DUALSPEED help - This driver provides USB Device Controller driver for LH7A40x + Faraday usb device controller FUSB300 driver -config USB_LH7A40X +config USB_FUSB300 tristate - depends on USB_GADGET_LH7A40X + depends on USB_GADGET_FUSB300 default USB_GADGET select USB_GADGET_SELECTED @@ -540,7 +540,7 @@ config USB_GADGET_CI13XXX_MSM boolean "MIPS USB CI13xxx for MSM" depends on ARCH_MSM select USB_GADGET_DUALSPEED - select USB_MSM_OTG_72K + select USB_MSM_OTG help MSM SoC has chipidea USB controller. This driver uses ci13xxx_udc core. |