Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6-omap-h63xx.git] / drivers / usb / gadget / Kconfig

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 6f45dd669b3378a3f4bd0c9970fe65fdcdae6cbb..6e784d2db42324a91995732fc82f7c16f32201c7 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
 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.
        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
           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
        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
           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
        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
 config USB_GADGET_ATMEL_USBA
        boolean "Atmel USBA"
        select USB_GADGET_DUALSPEED

-       depends on AVR32
+       depends on AVR32 || ARCH_AT91CAP9

        help
          USBA is the integrated high-speed USB Device controller on
        help
          USBA is the integrated high-speed USB Device controller on

-         the AT32AP700x processors from Atmel.
+         the AT32AP700x and AT91CAP9 processors from Atmel.

 
 config USB_ATMEL_USBA
        tristate
 
 config USB_ATMEL_USBA
        tristate


@@ -231,6 +231,26 @@ config SUPERH_BUILT_IN_M66592
           However, this problem is improved if change a value of
           NET_IP_ALIGN to 4.
 
           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
 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)"
 
 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
        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)"
 
 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
        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
          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,
        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.
 
          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".
 
          Say "y" to link the driver statically, or "m" to build a
          dynamically linked module called "gadgetfs".