[S390] Cleanup in Documentation/kernel-parameters.txt.

[deliverable/linux.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 17fc60e32443082da684a250e9e0b6fbecb34bbf..d29b6d926a42508b6020be3f7989e6dd33ed2140 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -370,8 +370,6 @@ and is between 256 and 4096 characters. It is defined in the file
                        configured.  Potentially dangerous and should only be
                        used if you are entirely sure of the consequences.
 
-       chandev=        [HW,NET] Generic channel device initialisation
-
        checkreqprot    [SELINUX] Set initial checkreqprot flag value.
                        Format: { "0" | "1" }
                        See security/selinux/Kconfig help text.
@@ -382,6 +380,12 @@ and is between 256 and 4096 characters. It is defined in the file
                        Value can be changed at runtime via
                                /selinux/checkreqprot.
 
+       cio_ignore=     [S390]
+                       See Documentation/s390/CommonIO for details.
+
+       cio_msg=        [S390]
+                       See Documentation/s390/CommonIO for details.
+
        clock=          [BUGS=X86-32, HW] gettimeofday clocksource override.
                        [Deprecated]
                        Forces specified clocksource (if available) to be used
@@ -1598,7 +1602,13 @@ and is between 256 and 4096 characters. It is defined in the file
                        Format: <vendor>:<model>:<flags>
                        (flags are integer value)
 
-       scsi_logging=   [SCSI]
+       scsi_logging_level=     [SCSI] a bit mask of logging levels
+                       See drivers/scsi/scsi_logging.h for bits.  Also
+                       settable via sysctl at dev.scsi.logging_level
+                       (/proc/sys/dev/scsi/logging_level).
+                       There is also a nice 'scsi_logging_level' script in the
+                       S390-tools package, available for download at
+                       http://www-128.ibm.com/developerworks/linux/linux390/s390-tools-1.5.4.html
 
        scsi_mod.scan=  [SCSI] sync (default) scans SCSI busses as they are
                        discovered.  async scans them in kernel threads,