Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

[linux-2.6-omap-h63xx.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 8932c58850bec159f7ef12be63f943b231ec703f..8e3f6e94386682dbcfa6379ea660d5d0daacc9ad 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1559,6 +1559,8 @@ and is between 256 and 4096 characters. It is defined in the file
                        Valid arguments: on, off
                        Default: on
 
+       noiotrap        [SH] Disables trapped I/O port accesses.
+
        noirqdebug      [X86-32] Disables the code which attempts to detect and
                        disable unhandled interrupt sources.