X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=drivers%2Fs390%2FKconfig;h=4d36208ff8de3cd3624f995948e4600843a08df9;hb=f57caaefacc2ffa7ace11a325c663e569e2b4164;hp=a86a650f3d6df13684cb07526469d9e8e7d283e3;hpb=c0d6f9663b30a09ed725229b2d50391268c8538e;p=powerpc.git

diff --git a/drivers/s390/Kconfig b/drivers/s390/Kconfig
index a86a650f3d..4d36208ff8 100644
--- 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)"