Merge branch 'linux-2.6'

[powerpc.git] / drivers / s390 / Kconfig

diff --git a/drivers/s390/Kconfig b/drivers/s390/Kconfig
index 4d36208..165af39 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


@@ -213,17 +205,35 @@ config MONREADER
        help
          Character device driver for reading z/VM monitor service records
 
        help
          Character device driver for reading z/VM monitor service records
 

+config MONWRITER
+       tristate "API for writing z/VM monitor service records"
+       default "m"
+       help
+         Character device driver for writing z/VM monitor service records
+

 endmenu
 
 menu "Cryptographic devices"
 
 endmenu
 
 menu "Cryptographic devices"
 

-config Z90CRYPT
+config ZCRYPT

        tristate "Support for PCI-attached cryptographic adapters"
        tristate "Support for PCI-attached cryptographic adapters"

-        default "m"
-        help
+       select ZCRYPT_MONOLITHIC if ZCRYPT="y"
+       default "m"
+       help

          Select this option if you want to use a PCI-attached cryptographic
          Select this option if you want to use a PCI-attached cryptographic

-         adapter like the PCI Cryptographic Accelerator (PCICA) or the PCI
-         Cryptographic Coprocessor (PCICC).  This option is also available
-         as a module called z90crypt.ko.
+         adapter like:
+         + PCI Cryptographic Accelerator (PCICA)
+         + PCI Cryptographic Coprocessor (PCICC)
+         + PCI-X Cryptographic Coprocessor (PCIXCC)
+         + Crypto Express2 Coprocessor (CEX2C)
+         + Crypto Express2 Accelerator (CEX2A)
+
+config ZCRYPT_MONOLITHIC
+       bool "Monolithic zcrypt module"
+       depends on ZCRYPT="m"
+       help
+         Select this option if you want to have a single module z90crypt.ko
+         that contains all parts of the crypto device driver (ap bus,
+         request router and all the card drivers).

 
 endmenu
 
 endmenu