Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

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

diff --git a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig
index b356e15..49a489e 100644 (file)
--- a/drivers/usb/storage/Kconfig
+++ b/drivers/usb/storage/Kconfig
@@ -172,6 +172,19 @@ config USB_STORAGE_CYPRESS_ATACB
 
          If this driver is compiled as a module, it will be named ums-cypress.
 
+config USB_UAS
+       tristate "USB Attached SCSI"
+       depends on USB && SCSI
+       help
+         The USB Attached SCSI protocol is supported by some USB
+         storage devices.  It permits higher performance by supporting
+         multiple outstanding commands.
+
+         If you don't know whether you have a UAS device, it is safe to
+         say 'Y' or 'M' here and the kernel will use the right driver.
+
+         If you compile this driver as a module, it will be named uas.
+
 config USB_LIBUSUAL
        bool "The shared table of common (or usual) storage devices"
        depends on USB