x86: various changes and cleanups to in_p/out_p delay details

[mirror_ubuntu-artful-kernel.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 9e6056058425934456715e7aa370f5f0912f98c7..b427b7c0e5d0298b20dc1e948594a2399df2160a 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -795,12 +795,14 @@ and is between 256 and 4096 characters. It is defined in the file
                        then look in the higher range.
 
        io_delay=       [X86-32,X86-64] I/O delay method
-               standard
-                       Standard port 0x80 delay
-               alternate
-                       Alternate port 0xed delay
+               0x80
+                       Standard port 0x80 based delay
+               0xed
+                       Alternate port 0xed based delay (needed on some systems)
                udelay
-                       Simple two microsecond delay
+                       Simple two microseconds delay
+               none
+                       No delay
 
        io7=            [HW] IO7 for Marvel based alpha systems
                        See comment before marvel_specify_io7 in