summaryrefslogtreecommitdiffstats
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-12-04 03:58:56 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-12-04 03:58:56 +0000
commit1d67e90f19a7acfd9a05dc59678e7d0c5090bd0d (patch)
tree357efc7b93f8f5102110d20d293f41360ec212fc /Documentation/kernel-parameters.txt
parentaea27b2e18d69af87e673972246e66657b4fa274 (diff)
Merge with Linux 2.3.21.
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r--Documentation/kernel-parameters.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 02f1310e7..dc57ee651 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -266,9 +266,11 @@ or parport=0xBBB[,IRQ[,DMA]] to use any IRQ/DMA settings detected
IRQ/DMA settings because of possible
conflicts). You can specify the base
address, IRQ, and DMA settings; IRQ
- and DMA should be numbers or 'auto'
+ and DMA should be numbers, or 'auto'
(for using detected settings on that
- particular port). Parallel ports are
+ particular port), or 'nofifo' (to
+ avoid using a FIFO even if it is
+ detected). Parallel ports are
assigned in the order they are
specified on the command line,
starting with parport0.