Merge remote-tracking branch 'block/for-next'

[karo-tx-linux.git] / drivers / block / Kconfig

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 9522682ee8fbf045eedcc31487691fec94f463df..f7de3228f626a0d849c503f059944f575a05f831 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -354,18 +354,6 @@ config BLK_DEV_SX8
 
          Use devices /dev/sx8/$N and /dev/sx8/$Np$M.
 
-config BLK_DEV_UB
-       tristate "Low Performance USB Block driver (deprecated)"
-       depends on USB
-       help
-         This driver supports certain USB attached storage devices
-         such as flash keys.
-
-         If you enable this driver, it is recommended to avoid conflicts
-         with usb-storage by enabling USB_LIBUSUAL.
-
-         If unsure, say N.
-
 config BLK_DEV_RAM
        tristate "RAM block device support"
        ---help---