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 08b3f240197f7e5b7dc09a516aa7692b06ce1a43..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
@@ -55,4 +55,12 @@ config DASD_DIAG
          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