vserver 2.0 rc7

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

diff --git a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig
index 1099581..f1f1c06 100644 (file)
--- a/drivers/usb/storage/Kconfig
+++ b/drivers/usb/storage/Kconfig
@@ -3,6 +3,7 @@
 #
 
 comment "NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information"
+       depends on USB
 
 config USB_STORAGE
        tristate "USB Mass Storage support"
@@ -30,28 +31,6 @@ config USB_STORAGE_DEBUG
          Say Y here in order to have the USB Mass Storage code generate
          verbose debugging messages.
 
-config USB_STORAGE_RW_DETECT
-       bool "USB Mass Storage Write-Protected Media Detection (EXPERIMENTAL)"
-       depends on USB_STORAGE && EXPERIMENTAL
-       help
-         Say Y here in order to have the USB Mass Storage code indicate to
-         the SCSI layer that using MODE SENSE(6) and MODE SENSE(10) to
-         determine if the media is write-protected is a good thing to do.
-
-         Many devices have historically had trouble with these commands,
-         hence the default 2.6.x behavior has been to suppress their use.
-         2.4.x used these commands with (at best) mixed results, often
-         crashing the firmware of the device.  However, the SCSI layer now
-         issues these commands in a manner more consistent with other
-         "popular" OSes, in an attempt to improve compatibility.
-
-         Saying Y here allows these commands to be sent to a USB device.
-         If you find a device this doesn't work for, switch to N and let
-         us know at <usb-storage@lists.one-eyed-alien.net>
-
-         If you say N here, the kernel will assume that all disk-like USB
-         devices are write-enabled.
-
 config USB_STORAGE_DATAFAB
        bool "Datafab Compact Flash Reader support (EXPERIMENTAL)"
        depends on USB_STORAGE && EXPERIMENTAL
@@ -89,12 +68,26 @@ config USB_STORAGE_DPCM
          Say Y here to support the Microtech/ZiO! CompactFlash reader.
          There is a web page at <http://www.ziocorp.com/products/>.
 
-config USB_STORAGE_HP8200e
-       bool "HP CD-Writer 82xx support (EXPERIMENTAL)"
+config USB_STORAGE_USBAT
+       bool "USBAT/USBAT02-based storage support (EXPERIMENTAL)"
        depends on USB_STORAGE && EXPERIMENTAL
        help
-         Say Y here to include additional code to support Hewlett-Packard
-         8200e/8210e/8230e CD-Writer Plus drives.
+         Say Y here to include additional code to support storage devices
+         based on the SCM/Shuttle USBAT/USBAT02 processors.
+
+         Devices reported to work with this driver include:
+         - CompactFlash reader included with Kodak DC3800 camera
+         - Dane-Elec Zmate CompactFlash reader
+         - Delkin Efilm reader2
+         - HP 8200e/8210e/8230e CD-Writer Plus drives
+         - I-JAM JS-50U
+         - Jessops CompactFlash JESDCFRU BLACK
+         - Kingston Technology PCREAD-USB/CF
+         - Maxell UA4 CompactFlash reader
+         - Memorex UCF-100
+         - Microtech ZiO! ICS-45 CF2
+         - RCA LYRA MP3 portable
+         - Sandisk ImageMate SDDR-05b
 
 config USB_STORAGE_SDDR09
        bool "SanDisk SDDR-09 (and other SmartMedia) support (EXPERIMENTAL)"