Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / usb / gadget / Kconfig

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index bc5123c..029e288 100644 (file)
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -260,6 +260,24 @@ config USB_R8A66597
        default USB_GADGET
        select USB_GADGET_SELECTED
 
+config USB_GADGET_RENESAS_USBHS
+       boolean "Renesas USBHS"
+       depends on USB_RENESAS_USBHS
+       select USB_GADGET_DUALSPEED
+       help
+          Renesas USBHS is a discrete USB host and peripheral controller
+          chip that supports both full and high speed USB 2.0 data transfers.
+          platform is able to configure endpoint (pipe) style
+
+          Say "y" to enable the gadget specific portion of the USBHS driver.
+
+
+config USB_RENESAS_USBHS_UDC
+       tristate
+       depends on USB_GADGET_RENESAS_USBHS
+       default USB_GADGET
+       select USB_GADGET_SELECTED
+
 config USB_GADGET_PXA27X
        boolean "PXA 27x"
        depends on ARCH_PXA && (PXA27x || PXA3xx)
@@ -338,6 +356,23 @@ config USB_S3C2410_DEBUG
        boolean "S3C2410 udc debug messages"
        depends on USB_GADGET_S3C2410
 
+config USB_GADGET_S3C_HSUDC
+       boolean "S3C2416, S3C2443 and S3C2450 USB Device Controller"
+       depends on ARCH_S3C2410
+       select USB_GADGET_DUALSPEED
+       help
+         Samsung's S3C2416, S3C2443 and S3C2450 is an ARM9 based SoC
+         integrated with dual speed USB 2.0 device controller. It has
+         8 endpoints, as well as endpoint zero.
+
+         This driver has been tested on S3C2416 and S3C2450 processors.
+
+config USB_S3C_HSUDC
+       tristate
+       depends on USB_GADGET_S3C_HSUDC
+       default USB_GADGET
+       select USB_GADGET_SELECTED
+
 config USB_GADGET_PXA_U2O
        boolean "PXA9xx Processor USB2.0 controller"
        select USB_GADGET_DUALSPEED
@@ -597,13 +632,10 @@ config USB_DUMMY_HCD
 
 endchoice
 
+# Selected by UDC drivers that support high-speed operation.
 config USB_GADGET_DUALSPEED
        bool
        depends on USB_GADGET
-       default n
-       help
-         Means that gadget drivers should include extra descriptors
-         and code to handle dual-speed controllers.
 
 #
 # USB Gadget Drivers