Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32

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

diff --git a/drivers/s390/block/Kconfig b/drivers/s390/block/Kconfig
index baf9cc3ebae3f52c41c40341fc684aff41a35e6e..b250c53545033cba2a019ee4e5973bf1bac04551 100644 (file)
--- a/drivers/s390/block/Kconfig
+++ b/drivers/s390/block/Kconfig
@@ -1,4 +1,4 @@
-if S390
+if S390 && BLOCK
 
 comment "S/390 block device drivers"
        depends on S390
@@ -49,10 +49,18 @@ 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
+       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.
+
 endif