Merge 2.6.38-rc5 into usb-next

[~andy/linux] / drivers / usb / gadget / Kconfig

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 06bb9d4587e936d3b052e9302deff3993d43ba95..99ed91c7cdc62912c1a73fe17c640e44ee43db4e 100644 (file)
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -176,6 +176,18 @@ config USB_FSL_USB2
        default USB_GADGET
        select USB_GADGET_SELECTED
 
+config USB_GADGET_FUSB300
+       boolean "Faraday FUSB300 USB Peripheral Controller"
+       select USB_GADGET_DUALSPEED
+       help
+          Faraday usb device controller FUSB300 driver
+
+config USB_FUSB300
+       tristate
+       depends on USB_GADGET_FUSB300
+       default USB_GADGET
+       select USB_GADGET_SELECTED
+
 config USB_GADGET_LH7A40X
        boolean "LH7A40X"
        depends on ARCH_LH7A40X
@@ -546,6 +558,8 @@ config USB_GADGET_CI13XXX_MSM
          ci13xxx_udc core.
          This driver depends on OTG driver for PHY initialization,
          clock management, powering up VBUS, and power management.
+         This driver is not supported on boards like trout which
+         has an external PHY.
 
          Say "y" to link the driver statically, or "m" to build a
          dynamically linked module called "ci13xxx_msm" and force all