Merge commit 'v2.6.26-rc9' into x86/cpu

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

diff --git a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig
index 86e48c42d6af3cf955c2cb4320bb33eeda29f77e..3d9249632ae12e7051174817241ef37ea6f2cd4c 100644 (file)
--- a/drivers/usb/storage/Kconfig
+++ b/drivers/usb/storage/Kconfig
@@ -8,8 +8,7 @@ comment "may also be needed; see USB_STORAGE Help for more information"
 
 config USB_STORAGE
        tristate "USB Mass Storage support"
-       depends on USB
-       select SCSI
+       depends on USB && SCSI
        ---help---
          Say Y here if you want to connect USB mass storage devices to your
          computer's USB port. This is the driver you need for USB
@@ -18,7 +17,7 @@ config USB_STORAGE
          similar devices. This driver may also be used for some cameras
          and card readers.
 
-         This option 'selects' (turns on, enables) 'SCSI', but you
+         This option depends on 'SCSI' support being enabled, but you
          probably also need 'SCSI device support: SCSI disk support'
          (BLK_DEV_SD) for most USB storage devices.
 
@@ -33,8 +32,8 @@ config USB_STORAGE_DEBUG
          verbose debugging messages.
 
 config USB_STORAGE_DATAFAB
-       bool "Datafab Compact Flash Reader support (EXPERIMENTAL)"
-       depends on USB_STORAGE && EXPERIMENTAL
+       bool "Datafab Compact Flash Reader support"
+       depends on USB_STORAGE
        help
          Support for certain Datafab CompactFlash readers.
          Datafab has a web page at <http://www.datafabusa.com/>.
@@ -49,7 +48,6 @@ config USB_STORAGE_FREECOM
 config USB_STORAGE_ISD200
        bool "ISD-200 USB/ATA Bridge support"
        depends on USB_STORAGE
-       depends on BLK_DEV_IDE=y || BLK_DEV_IDE=USB_STORAGE
        ---help---
          Say Y here if you want to use USB Mass Store devices based
          on the In-Systems Design ISD-200 USB/ATA bridge.
@@ -71,8 +69,8 @@ config USB_STORAGE_DPCM
          There is a web page at <http://www.ziocorp.com/products/>.
 
 config USB_STORAGE_USBAT
-       bool "USBAT/USBAT02-based storage support (EXPERIMENTAL)"
-       depends on USB_STORAGE && EXPERIMENTAL
+       bool "USBAT/USBAT02-based storage support"
+       depends on USB_STORAGE
        help
          Say Y here to include additional code to support storage devices
          based on the SCM/Shuttle USBAT/USBAT02 processors.
@@ -92,40 +90,41 @@ config USB_STORAGE_USBAT
          - Sandisk ImageMate SDDR-05b
 
 config USB_STORAGE_SDDR09
-       bool "SanDisk SDDR-09 (and other SmartMedia) support (EXPERIMENTAL)"
-       depends on USB_STORAGE && EXPERIMENTAL
+       bool "SanDisk SDDR-09 (and other SmartMedia) support"
+       depends on USB_STORAGE
        help
          Say Y here to include additional code to support the Sandisk SDDR-09
          SmartMedia reader in the USB Mass Storage driver.
          Also works for the Microtech Zio! SmartMedia reader.
 
 config USB_STORAGE_SDDR55
-       bool "SanDisk SDDR-55 SmartMedia support (EXPERIMENTAL)"
-       depends on USB_STORAGE && EXPERIMENTAL
+       bool "SanDisk SDDR-55 SmartMedia support"
+       depends on USB_STORAGE
        help
          Say Y here to include additional code to support the Sandisk SDDR-55
          SmartMedia reader in the USB Mass Storage driver.
 
 config USB_STORAGE_JUMPSHOT
-       bool "Lexar Jumpshot Compact Flash Reader (EXPERIMENTAL)"
-       depends on USB_STORAGE && EXPERIMENTAL
+       bool "Lexar Jumpshot Compact Flash Reader"
+       depends on USB_STORAGE
        help
          Say Y here to include additional code to support the Lexar Jumpshot
          USB CompactFlash reader.
 
 config USB_STORAGE_ALAUDA
-       bool "Olympus MAUSB-10/Fuji DPC-R1 support (EXPERIMENTAL)"
-       depends on USB_STORAGE && EXPERIMENTAL
+       bool "Olympus MAUSB-10/Fuji DPC-R1 support"
+       depends on USB_STORAGE
        help
          Say Y here to include additional code to support the Olympus MAUSB-10
          and Fujifilm DPC-R1 USB Card reader/writer devices.
 
-         These devices are based on the Alauda chip and support support both
+         These devices are based on the Alauda chip and support both
          XD and SmartMedia cards.
 
 config USB_STORAGE_ONETOUCH
-       bool "Support OneTouch Button on Maxtor Hard Drives (EXPERIMENTAL)"
-       depends on USB_STORAGE && INPUT_EVDEV && EXPERIMENTAL && !PM
+       bool "Support OneTouch Button on Maxtor Hard Drives"
+       depends on USB_STORAGE
+       depends on INPUT=y || INPUT=USB_STORAGE
        help
          Say Y here to include additional code to support the Maxtor OneTouch
          USB hard drive's onetouch button.
@@ -147,6 +146,17 @@ config USB_STORAGE_KARMA
          on the resulting scsi device node returns the Karma to normal
          operation.
 
+config USB_STORAGE_CYPRESS_ATACB
+       bool "SAT emulation on Cypress USB/ATA Bridge with ATACB"
+       depends on USB_STORAGE
+       ---help---
+         Say Y here if you want to use SAT (ata pass through) on devices based
+         on the Cypress USB/ATA bridge supporting ATACB. This will allow you
+         to use tools to tune and monitor your drive (like hdparm or smartctl).
+
+         If you say no here your device will still work with the standard usb
+         mass storage class.
+
 config USB_LIBUSUAL
        bool "The shared table of common (or usual) storage devices"
        depends on USB