Merge branch 'delete-xt-disk' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg...

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

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 824e09c4d0d7d1bcd83a00b87e37e1ca0115d5fb..5dc0daed8fac523f5d631c3cd4a022f6fb4c5aca 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -63,19 +63,6 @@ config AMIGA_Z2RAM
          To compile this driver as a module, choose M here: the
          module will be called z2ram.
 
-config BLK_DEV_XD
-       tristate "XT hard disk support"
-       depends on ISA && ISA_DMA_API
-       select CHECK_SIGNATURE
-       help
-         Very old 8 bit hard disk controllers used in the IBM XT computer
-         will be supported if you say Y here.
-
-         To compile this driver as a module, choose M here: the
-         module will be called xd.
-
-         It's pretty unlikely that you have one of these: say N.
-
 config GDROM
        tristate "SEGA Dreamcast GD-ROM drive"
        depends on SH_DREAMCAST
@@ -544,4 +531,14 @@ config BLK_DEV_RBD
 
          If unsure, say N.
 
+config BLK_DEV_RSXX
+       tristate "RamSam PCIe Flash SSD Device Driver"
+       depends on PCI
+       help
+         Device driver for IBM's high speed PCIe SSD
+         storage devices: RamSan-70 and RamSan-80.
+
+         To compile this driver as a module, choose M here: the
+         module will be called rsxx.
+
 endif # BLK_DEV