Merge branch 'for-linus' of git://neil.brown.name/md

[linux-2.6] / drivers / usb / core / Kconfig

diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig
index 5c33cdb9cac7131a0e4d2715ecbcec538903406f..cc9f397e8398043b250a424bc582fcc9d008e102 100644 (file)
--- a/drivers/usb/core/Kconfig
+++ b/drivers/usb/core/Kconfig
@@ -76,8 +76,8 @@ config USB_DEVICE_CLASS
            NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", MODE="0644"
 
 config USB_DYNAMIC_MINORS
            NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", MODE="0644"
 
 config USB_DYNAMIC_MINORS

-       bool "Dynamic USB minor allocation (EXPERIMENTAL)"
-       depends on USB && EXPERIMENTAL
+       bool "Dynamic USB minor allocation"
+       depends on USB

        help
          If you say Y here, the USB subsystem will use dynamic minor
          allocation for any device that uses the USB major number.
        help
          If you say Y here, the USB subsystem will use dynamic minor
          allocation for any device that uses the USB major number.


@@ -87,12 +87,13 @@ config USB_DYNAMIC_MINORS
          If you are unsure about this, say N here.
 
 config USB_SUSPEND
          If you are unsure about this, say N here.
 
 config USB_SUSPEND

-       bool "USB selective suspend/resume and wakeup (EXPERIMENTAL)"
-       depends on USB && PM && EXPERIMENTAL
+       bool "USB selective suspend/resume and wakeup"
+       depends on USB && PM

        help
          If you say Y here, you can use driver calls or the sysfs
        help
          If you say Y here, you can use driver calls or the sysfs

-         "power/state" file to suspend or resume individual USB
-         peripherals.
+         "power/level" file to suspend or resume individual USB
+         peripherals and to enable or disable autosuspend (see
+         Documentation/usb/power-management.txt for more details).

 
          Also, USB "remote wakeup" signaling is supported, whereby some
          USB devices (like keyboards and network adapters) can wake up
 
          Also, USB "remote wakeup" signaling is supported, whereby some
          USB devices (like keyboards and network adapters) can wake up


@@ -101,31 +102,6 @@ config USB_SUSPEND
 
          If you are unsure about this, say N here.
 
 
          If you are unsure about this, say N here.
 

-config USB_PERSIST
-       bool "USB device persistence during system suspend (DANGEROUS)"
-       depends on USB && PM && EXPERIMENTAL
-       default n
-       help
-
-         If you say Y here and enable the "power/persist" attribute
-         for a USB device, the device's data structures will remain
-         persistent across system suspend, even if the USB bus loses
-         power.  (This includes hibernation, also known as swsusp or
-         suspend-to-disk.)  The devices will reappear as if by magic
-         when the system wakes up, with no need to unmount USB
-         filesystems, rmmod host-controller drivers, or do anything
-         else.
-
-               WARNING: This option can be dangerous!
-
-         If a USB device is replaced by another of the same type while
-         the system is asleep, there's a good chance the kernel won't
-         detect the change.  Likewise if the media in a USB storage
-         device is replaced.  When this happens it's almost certain to
-         cause data corruption and maybe even crash your system.
-
-         If you are unsure, say N here.
-

 config USB_OTG
        bool
        depends on USB && EXPERIMENTAL
 config USB_OTG
        bool
        depends on USB && EXPERIMENTAL


@@ -135,14 +111,16 @@ config USB_OTG
 
 config USB_OTG_WHITELIST
        bool "Rely on OTG Targeted Peripherals List"
 
 config USB_OTG_WHITELIST
        bool "Rely on OTG Targeted Peripherals List"

-       depends on USB_OTG
-       default y
+       depends on USB_OTG || EMBEDDED
+       default y if USB_OTG
+       default n if EMBEDDED

        help
          If you say Y here, the "otg_whitelist.h" file will be used as a
          product whitelist, so USB peripherals not listed there will be
          rejected during enumeration.  This behavior is required by the
          USB OTG specification for all devices not on your product's
        help
          If you say Y here, the "otg_whitelist.h" file will be used as a
          product whitelist, so USB peripherals not listed there will be
          rejected during enumeration.  This behavior is required by the
          USB OTG specification for all devices not on your product's

-         "Targeted Peripherals List".
+         "Targeted Peripherals List".  "Embedded Hosts" are likewise
+         allowed to support only a limited number of peripherals.

 
          Otherwise, peripherals not listed there will only generate a
          warning and enumeration will continue.  That's more like what
 
          Otherwise, peripherals not listed there will only generate a
          warning and enumeration will continue.  That's more like what


@@ -151,9 +129,10 @@ config USB_OTG_WHITELIST
 
 config USB_OTG_BLACKLIST_HUB
        bool "Disable external hubs"
 
 config USB_OTG_BLACKLIST_HUB
        bool "Disable external hubs"

-       depends on USB_OTG
+       depends on USB_OTG || EMBEDDED

        help
          If you say Y here, then Linux will refuse to enumerate
          external hubs.  OTG hosts are allowed to reduce hardware
        help
          If you say Y here, then Linux will refuse to enumerate
          external hubs.  OTG hosts are allowed to reduce hardware

-         and software costs by not supporting external hubs.
+         and software costs by not supporting external hubs.  So
+         are "Emedded Hosts" that don't offer OTG support.