Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / drivers / s390 / block / Kconfig

diff --git a/drivers/s390/block/Kconfig b/drivers/s390/block/Kconfig
index 6e7d7b0..929d6ff 100644 (file)
--- a/drivers/s390/block/Kconfig
+++ b/drivers/s390/block/Kconfig
@@ -1,11 +1,11 @@
-if ARCH_S390
+if S390
 
 comment "S/390 block device drivers"
-       depends on ARCH_S390
+       depends on S390
 
 config BLK_DEV_XPRAM
        tristate "XPRAM disk support"
-       depends on ARCH_S390
+       depends on S390
        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
@@ -49,20 +49,18 @@ config DASD_FBA
 
 config DASD_DIAG
        tristate "Support for DIAG access to Disks"
-       depends on DASD && ( ARCH_S390X = '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_CMB
-       tristate "Compatibility interface for DASD channel measurement blocks"
+config DASD_EER
+       bool "Extended error reporting (EER)"
        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.
+         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.
 
 endif