aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2004-11-12 19:31:13 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-11-12 19:31:13 -0800
commit717abc98fe8ba4fcb2c02eb1609c6a68fe7d9c4f (patch)
tree9909f09f486f89159d8963a4acd9bf7254fa268c /Documentation
parentda050bdb02b94bc87740e35b7f10a80bb8e755ae (diff)
parent8f0f592db3b997b57fbdf6c852d84f982e0c3428 (diff)
downloadhistory-717abc98fe8ba4fcb2c02eb1609c6a68fe7d9c4f.tar.gz
Merge bk://kernel.bkbits.net/gregkh/linux/pci-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 2807201154522d..ae9eb2f01e6965 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -931,6 +931,10 @@ running once the system is up.
enabled.
noacpi [IA-32] Do not use ACPI for IRQ routing
or for PCI scanning.
+ routeirq Do IRQ routing for all PCI devices.
+ This is normally done in pci_enable_device(),
+ so this option is a temporary workaround
+ for broken drivers that don't call it.
firmware [ARM] Do not re-enumerate the bus but
instead just use the configuration