[S390] tape block: fix dependencies

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

diff --git a/drivers/s390/char/Kconfig b/drivers/s390/char/Kconfig
index a3d095de5d7df670c92c4ecaa4c1392bcc5aa1e3..0769ced52dbd64c3b5583f7c447971fd2e8eeb4d 100644 (file)
--- a/drivers/s390/char/Kconfig
+++ b/drivers/s390/char/Kconfig
@@ -44,15 +44,9 @@ config CCW_CONSOLE
        depends on TN3215_CONSOLE || TN3270_CONSOLE
        default y
 
-config SCLP
-       bool "Support for SCLP"
-       depends on S390
-       help
-         Include support for the SCLP interface to the service element.
-
 config SCLP_TTY
        bool "Support for SCLP line mode terminal"
-       depends on SCLP
+       depends on S390
        help
          Include support for IBM SCLP line-mode terminals.
 
@@ -65,7 +59,7 @@ config SCLP_CONSOLE
 
 config SCLP_VT220_TTY
        bool "Support for SCLP VT220-compatible terminal"
-       depends on SCLP
+       depends on S390
        help
          Include support for an IBM SCLP VT220-compatible terminal.
 
@@ -78,7 +72,7 @@ config SCLP_VT220_CONSOLE
 
 config SCLP_CPI
        tristate "Control-Program Identification"
-       depends on SCLP
+       depends on S390
        help
          This option enables the hardware console interface for system
          identification. This is commonly used for workload management and
@@ -106,7 +100,7 @@ comment "S/390 tape interface support"
 
 config S390_TAPE_BLOCK
        bool "Support for tape block devices"
-       depends on S390_TAPE
+       depends on S390_TAPE && BLOCK
        help
          Select this option if you want to access your channel-attached tape
          devices using the block device interface.  This interface is similar
@@ -166,6 +160,7 @@ config MONWRITER
 
 config S390_VMUR
        tristate "z/VM unit record device driver"
+       depends on S390
        default "m"
        help
          Character device driver for z/VM reader, puncher and printer.