Merge branch 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / s390 / char / Kconfig

diff --git a/drivers/s390/char/Kconfig b/drivers/s390/char/Kconfig
index 3f36cb3..4e34d36 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
 
        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"
 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.
 
        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"
 
 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.
 
        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"
 
 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
        help
          This option enables the hardware console interface for system
          identification. This is commonly used for workload management and


@@ -88,6 +82,16 @@ config SCLP_CPI
          You should only select this option if you know what you are doing,
          need this feature and intend to run your kernel in LPAR.
 
          You should only select this option if you know what you are doing,
          need this feature and intend to run your kernel in LPAR.
 

+config SCLP_ASYNC
+       tristate "Support for Call Home via Asynchronous SCLP Records"
+       depends on S390
+       help
+         This option enables the call home function, which is able to inform
+         the service element and connected organisations about a kernel panic.
+         You should only select this option if you know what you are doing,
+         want for inform other people about your kernel panics,
+         need this feature and intend to run your kernel in LPAR.
+

 config S390_TAPE
        tristate "S/390 tape device support"
        depends on CCW
 config S390_TAPE
        tristate "S/390 tape device support"
        depends on CCW


@@ -106,7 +110,7 @@ comment "S/390 tape interface support"
 
 config S390_TAPE_BLOCK
        bool "Support for tape block devices"
 
 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
        help
          Select this option if you want to access your channel-attached tape
          devices using the block device interface.  This interface is similar