Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[cascardo/linux.git] / drivers / s390 / char / Kconfig

diff --git a/drivers/s390/char/Kconfig b/drivers/s390/char/Kconfig
index eaca3e0..b3f1c45 100644 (file)
--- a/drivers/s390/char/Kconfig
+++ b/drivers/s390/char/Kconfig
@@ -78,19 +78,6 @@ config SCLP_VT220_CONSOLE
          Include support for using an IBM SCLP VT220-compatible terminal as a
          Linux system console.
 
-config SCLP_CPI
-       def_tristate m
-       prompt "Control-Program Identification"
-       depends on S390
-       help
-         This option enables the hardware console interface for system
-         identification. This is commonly used for workload management and
-         gives you a nice name for the system on the service element.
-         Please select this option as a module since built-in operation is
-         completely untested.
-         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
        def_tristate m
        prompt "Support for Call Home via Asynchronous SCLP Records"
@@ -125,6 +112,14 @@ config HMC_DRV
          transfer cache size from it's default value 0.5MB to N bytes. If N
          is zero, then no caching is performed.
 
+config SCLP_OFB
+       def_bool n
+       prompt "Support for Open-for-Business SCLP Event"
+       depends on S390
+       help
+         This option enables the Open-for-Business interface to the s390
+         Service Element.
+
 config S390_TAPE
        def_tristate m
        prompt "S/390 tape device support"