hrtimer: convert kvm to the new hrtimer apis

[linux-2.6-omap-h63xx.git] / drivers / s390 / block / Kconfig

diff --git a/drivers/s390/block/Kconfig b/drivers/s390/block/Kconfig
index 6912399d0937099c89d08d9caea2850b0b0d1337..07883197f474a6f50883e9f22ddfc587d1fdbcf0 100644 (file)
--- a/drivers/s390/block/Kconfig
+++ b/drivers/s390/block/Kconfig
@@ -1,11 +1,9 @@
-if S390
-
 comment "S/390 block device drivers"
-       depends on S390
+       depends on S390 && BLOCK
 
 config BLK_DEV_XPRAM
        tristate "XPRAM disk support"
-       depends on S390
+       depends on S390 && BLOCK
        help
          Select this option if you want to use your expanded storage on S/390
          or zSeries as a disk.  This is useful as a _fast_ swap device if you
@@ -15,12 +13,14 @@ config BLK_DEV_XPRAM
 
 config DCSSBLK
        tristate "DCSSBLK support"
+       depends on S390 && BLOCK
        help
          Support for dcss block device
 
 config DASD
        tristate "Support for DASD devices"
-       depends on CCW
+       depends on CCW && BLOCK
+       select IOSCHED_DEADLINE
        help
          Enable this option if you want to access DASDs directly utilizing
          S/390s channel subsystem commands. This is necessary for running
@@ -49,28 +49,16 @@ config DASD_FBA
 
 config DASD_DIAG
        tristate "Support for DIAG access to Disks"
-       depends on DASD && ( 64BIT = 'n' || EXPERIMENTAL)
+       depends on DASD
        help
          Select this option if you want to use Diagnose250 command to access
          Disks under VM.  If you are not running under VM or unsure what it is,
          say "N".
 
 config DASD_EER
-       tristate "Extended error reporting (EER)"
+       bool "Extended error reporting (EER)"
        depends on DASD
        help
          This driver provides a character device interface to the
-          DASD extended error reporting. This is only needed if you want to
-          use applications written for the EER facility.
-
-config DASD_CMB
-       tristate "Compatibility interface for DASD channel measurement blocks"
-       depends on DASD
-       help
-         This driver provides an additional interface to the channel
-          measurement facility, which is normally accessed though sysfs, with
-          a set of ioctl functions specific to the dasd driver.
-         This is only needed if you want to use applications written for
-         linux-2.4 dasd channel measurement facility interface.
-
-endif
+         DASD extended error reporting. This is only needed if you want to
+         use applications written for the EER facility.