Merge branch 'linus' into x86/urgent

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

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index d681bb2..d6bab0d 100644 (file)
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -44,8 +44,8 @@ menuconfig USB_GADGET
 if USB_GADGET
 
 config USB_GADGET_DEBUG
-       boolean "Debugging messages"
-       depends on USB_GADGET && DEBUG_KERNEL && EXPERIMENTAL
+       boolean "Debugging messages (DEVELOPMENT)"
+       depends on USB_GADGET && DEBUG_KERNEL
        help
           Many controller and gadget drivers will print some debugging
           messages if you use this option to ask for those messages.
@@ -58,7 +58,7 @@ config USB_GADGET_DEBUG
           production build.
 
 config USB_GADGET_DEBUG_FILES
-       boolean "Debugging information files"
+       boolean "Debugging information files (DEVELOPMENT)"
        depends on USB_GADGET && PROC_FS
        help
           Some of the drivers in the "gadget" framework can expose
@@ -69,7 +69,7 @@ config USB_GADGET_DEBUG_FILES
           here.  If in doubt, or to conserve kernel memory, say "N".
 
 config USB_GADGET_DEBUG_FS
-       boolean "Debugging information files in debugfs"
+       boolean "Debugging information files in debugfs (DEVELOPMENT)"
        depends on USB_GADGET && DEBUG_FS
        help
           Some of the drivers in the "gadget" framework can expose
@@ -118,10 +118,10 @@ config USB_AMD5536UDC
 config USB_GADGET_ATMEL_USBA
        boolean "Atmel USBA"
        select USB_GADGET_DUALSPEED
-       depends on AVR32 || ARCH_AT91CAP9
+       depends on AVR32 || ARCH_AT91CAP9 || ARCH_AT91SAM9RL
        help
          USBA is the integrated high-speed USB Device controller on
-         the AT32AP700x and AT91CAP9 processors from Atmel.
+         the AT32AP700x, some AT91SAM9 and AT91CAP9 processors from Atmel.
 
 config USB_ATMEL_USBA
        tristate
@@ -172,7 +172,7 @@ config USB_NET2280
        default USB_GADGET
        select USB_GADGET_SELECTED
 
-config USB_GADGET_PXA2XX
+config USB_GADGET_PXA25X
        boolean "PXA 25x or IXP 4xx"
        depends on (ARCH_PXA && PXA25x) || ARCH_IXP4XX
        help
@@ -184,19 +184,19 @@ config USB_GADGET_PXA2XX
           zero (for control transfers).
 
           Say "y" to link the driver statically, or "m" to build a
-          dynamically linked module called "pxa2xx_udc" and force all
+          dynamically linked module called "pxa25x_udc" and force all
           gadget drivers to also be dynamically linked.
 
-config USB_PXA2XX
+config USB_PXA25X
        tristate
-       depends on USB_GADGET_PXA2XX
+       depends on USB_GADGET_PXA25X
        default USB_GADGET
        select USB_GADGET_SELECTED
 
 # if there's only one gadget driver, using only two bulk endpoints,
 # don't waste memory for the other endpoints
-config USB_PXA2XX_SMALL
-       depends on USB_GADGET_PXA2XX
+config USB_PXA25X_SMALL
+       depends on USB_GADGET_PXA25X
        bool
        default n if USB_ETH_RNDIS
        default y if USB_ZERO
@@ -231,6 +231,26 @@ config SUPERH_BUILT_IN_M66592
           However, this problem is improved if change a value of
           NET_IP_ALIGN to 4.
 
+config USB_GADGET_PXA27X
+       boolean "PXA 27x"
+       depends on ARCH_PXA && PXA27x
+       help
+          Intel's PXA 27x series XScale ARM v5TE processors include
+          an integrated full speed USB 1.1 device controller.
+
+          It has up to 23 endpoints, as well as endpoint zero (for
+          control transfers).
+
+          Say "y" to link the driver statically, or "m" to build a
+          dynamically linked module called "pxa27x_udc" and force all
+          gadget drivers to also be dynamically linked.
+
+config USB_PXA27X
+       tristate
+       depends on USB_GADGET_PXA27X
+       default USB_GADGET
+       select USB_GADGET_SELECTED
+
 config USB_GADGET_GOKU
        boolean "Toshiba TC86C001 'Goku-S'"
        depends on PCI
@@ -337,7 +357,7 @@ config USB_AT91
 
 config USB_GADGET_DUMMY_HCD
        boolean "Dummy HCD (DEVELOPMENT)"
-       depends on (USB=y || (USB=m && USB_GADGET=m)) && EXPERIMENTAL
+       depends on USB=y || (USB=m && USB_GADGET=m)
        select USB_GADGET_DUALSPEED
        help
          This host controller driver emulates USB, looping all data transfer
@@ -404,7 +424,6 @@ choice
 
 config USB_ZERO
        tristate "Gadget Zero (DEVELOPMENT)"
-       depends on EXPERIMENTAL
        help
          Gadget Zero is a two-configuration device.  It either sinks and
          sources bulk data; or it loops back a configurable number of
@@ -468,8 +487,8 @@ config USB_ETH
          dynamically linked module called "g_ether".
 
 config USB_ETH_RNDIS
-       bool "RNDIS support (EXPERIMENTAL)"
-       depends on USB_ETH && EXPERIMENTAL
+       bool "RNDIS support"
+       depends on USB_ETH
        default y
        help
           Microsoft Windows XP bundles the "Remote NDIS" (RNDIS) protocol,
@@ -495,6 +514,9 @@ config USB_GADGETFS
          All endpoints, transfer speeds, and transfer types supported by
          the hardware are available, through read() and write() calls.
 
+         Currently, this option is still labelled as EXPERIMENTAL because
+         of existing race conditions in the underlying in-kernel AIO core.
+
          Say "y" to link the driver statically, or "m" to build a
          dynamically linked module called "gadgetfs".