Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block

[sfrench/cifs-2.6.git] / drivers / block / Kconfig

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 6e23af1ecbdb3fca4600bf3fafecce4126ba7f3a..c5a61571a07694a80117add7b0c67579d3a78b19 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -59,17 +59,6 @@ config AMIGA_Z2RAM
          To compile this driver as a module, choose M here: the
          module will be called z2ram.
 
-config ATARI_SLM
-       tristate "Atari SLM laser printer support"
-       depends on ATARI
-       help
-         If you have an Atari SLM laser printer, say Y to include support for
-         it in the kernel. Otherwise, say N. This driver is also available as
-         a module ( = code which can be inserted in and removed from the
-         running kernel whenever you want). The module will be called
-         acsi_slm. Be warned: the driver needs much ST-RAM and can cause
-         problems due to that fact!
-
 config BLK_DEV_XD
        tristate "XT hard disk support"
        depends on ISA && ISA_DMA_API
@@ -113,7 +102,7 @@ source "drivers/block/paride/Kconfig"
 
 config BLK_CPQ_DA
        tristate "Compaq SMART2 support"
-       depends on PCI
+       depends on PCI && VIRT_TO_BUS
        help
          This is the driver for Compaq Smart Array controllers.  Everyone
          using these boards should say Y here.  See the file
@@ -423,6 +412,13 @@ config ATA_OVER_ETH
        This driver provides Support for ATA over Ethernet block
        devices like the Coraid EtherDrive (R) Storage Blade.
 
+config SUNVDC
+       tristate "Sun Virtual Disk Client support"
+       depends on SUN_LDOMS
+       help
+         Support for virtual disk devices as a client under Sun
+         Logical Domains.
+
 source "drivers/s390/block/Kconfig"
 
 endif # BLK_DEV