Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6] / drivers / s390 / Kconfig

diff --git a/drivers/s390/Kconfig b/drivers/s390/Kconfig
index ae89b9b88743462538ba6069b268a13642530045..165af398fdead8b181edc120ae91ed6a364f1cb3 100644 (file)
--- a/drivers/s390/Kconfig
+++ b/drivers/s390/Kconfig
@@ -103,14 +103,8 @@ config CCW_CONSOLE
        depends on TN3215_CONSOLE || TN3270_CONSOLE
        default y
  
        depends on TN3215_CONSOLE || TN3270_CONSOLE
        default y
  

-config SCLP
-       bool "Support for SCLP"
-       help
-         Include support for the SCLP interface to the service element.
-

 config SCLP_TTY
        bool "Support for SCLP line mode terminal"
 config SCLP_TTY
        bool "Support for SCLP line mode terminal"

-       depends on SCLP

        help
          Include support for IBM SCLP line-mode terminals.
 
        help
          Include support for IBM SCLP line-mode terminals.
 


@@ -123,7 +117,6 @@ config SCLP_CONSOLE
 
 config SCLP_VT220_TTY
        bool "Support for SCLP VT220-compatible terminal"
 
 config SCLP_VT220_TTY
        bool "Support for SCLP VT220-compatible terminal"

-       depends on SCLP

        help
          Include support for an IBM SCLP VT220-compatible terminal.
 
        help
          Include support for an IBM SCLP VT220-compatible terminal.
 


@@ -136,7 +129,6 @@ config SCLP_VT220_CONSOLE
 
 config SCLP_CPI
        tristate "Control-Program Identification"
 
 config SCLP_CPI
        tristate "Control-Program Identification"

-       depends on SCLP

        help
          This option enables the hardware console interface for system
          identification. This is commonly used for workload management and
        help
          This option enables the hardware console interface for system
          identification. This is commonly used for workload management and