aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <greg@kroah.com>2004-11-11 00:18:52 -0800
committerGreg Kroah-Hartman <greg@kroah.com>2004-11-11 00:18:52 -0800
commit3c80c5028e1ed60edcc5136205fae14b7b3ad28b (patch)
tree2a2e9cf0edff8ef28cf0830aeafe3e90b2d26a01 /Documentation
parent5c79e500d8adaf79672319489b1ae092361e3d03 (diff)
parent435883d2c7e37c41826910f42d2d3b727280f0a0 (diff)
downloadhistory-3c80c5028e1ed60edcc5136205fae14b7b3ad28b.tar.gz
merge
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