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 b4c8319138b29fbd762941ae74b4cbcc7d441cd3..c5a61571a07694a80117add7b0c67579d3a78b19 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -2,9 +2,12 @@
 # Block device driver configuration
 #
 
-if BLOCK
+menuconfig BLK_DEV
+       bool "Block devices"
+       depends on BLOCK
+       default y
 
-menu "Block devices"
+if BLK_DEV
 
 config BLK_DEV_FD
        tristate "Normal floppy disk support"
@@ -56,48 +59,6 @@ config AMIGA_Z2RAM
          To compile this driver as a module, choose M here: the
          module will be called z2ram.
 
-config ATARI_ACSI
-       tristate "Atari ACSI support"
-       depends on ATARI && BROKEN
-       ---help---
-         This enables support for the Atari ACSI interface. The driver
-         supports hard disks and CD-ROMs, which have 512-byte sectors, or can
-         be switched to that mode. Due to the ACSI command format, only disks
-         up to 1 GB are supported. Special support for certain ACSI to SCSI
-         adapters, which could relax that, isn't included yet. The ACSI
-         driver is also the basis for certain other drivers for devices
-         attached to the ACSI bus: Atari SLM laser printer, BioNet-100
-         Ethernet, and PAMsNet Ethernet. If you want to use one of these
-         devices, you need ACSI support, too.
-
-         To compile this driver as a module, choose M here: the
-         module will be called acsi.
-
-comment "Some devices (e.g. CD jukebox) support multiple LUNs"
-       depends on ATARI && ATARI_ACSI
-
-config ACSI_MULTI_LUN
-       bool "Probe all LUNs on each ACSI device"
-       depends on ATARI_ACSI
-       help
-         If you have a ACSI device that supports more than one LUN (Logical
-         Unit Number), e.g. a CD jukebox, you should say Y here so that all
-         will be found by the ACSI driver. An ACSI device with multiple LUNs
-         acts logically like multiple ACSI devices. The vast majority of ACSI
-         devices have only one LUN, and so most people can say N here and
-         should in fact do so, because it is safer.
-
-config ATARI_SLM
-       tristate "Atari SLM laser printer support"
-       depends on ATARI && ATARI_ACSI!=n
-       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
@@ -141,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
@@ -451,8 +412,13 @@ config ATA_OVER_ETH
        This driver provides Support for ATA over Ethernet block
        devices like the Coraid EtherDrive (R) Storage Blade.
 
-source "drivers/s390/block/Kconfig"
+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.
 
-endmenu
+source "drivers/s390/block/Kconfig"
 
-endif
+endif # BLK_DEV