fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / s390 / Kconfig

diff --git a/drivers/s390/Kconfig b/drivers/s390/Kconfig
index 96413c2..ae89b9b 100644 (file)
--- a/drivers/s390/Kconfig
+++ b/drivers/s390/Kconfig
@@ -51,6 +51,13 @@ config UNIX98_PTY_COUNT
          When not in use, each additional set of 256 PTYs occupy
          approximately 8 KB of kernel memory on 32-bit architectures.
 
+config HANGCHECK_TIMER
+       tristate "Hangcheck timer"
+       help
+         The hangcheck-timer module detects when the system has gone
+         out to lunch past a certain margin.  It can reboot the system
+         or merely print a warning.
+
 source "drivers/char/watchdog/Kconfig"
 
 comment "S/390 character device drivers"
@@ -176,7 +183,13 @@ config S390_TAPE_34XX
          tape subsystems and 100% compatibles.
          It is safe to say "Y" here.
 
-
+config S390_TAPE_3590
+       tristate "Support for 3590 tape hardware"
+       depends on S390_TAPE
+       help
+         Select this option if you want to access IBM 3590 magnetic
+         tape subsystems and 100% compatibles.
+         It is safe to say "Y" here.
 
 config VMLOGRDR
        tristate "Support for the z/VM recording system services (VM only)"
@@ -187,23 +200,48 @@ config VMLOGRDR
          *SYMPTOM.
          This driver depends on the IUCV support driver.
 
+config VMCP
+       tristate "Support for the z/VM CP interface (VM only)"
+       help
+         Select this option if you want to be able to interact with the control
+         program on z/VM
+
+
 config MONREADER
        tristate "API for reading z/VM monitor service records"
        depends on IUCV
        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"
 
-config Z90CRYPT
+config ZCRYPT
        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
-         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