summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-25 01:23:03 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-25 01:23:03 +0200
commit236e946b53ffd5e2f5d7e6abebbe72a9f0826d15 (patch)
treeb50c372fd90fe736f7d29aab15fbb3b13780acd8 /Documentation
parentMerge git://git.infradead.org/battery-2.6 (diff)
downloadlinux-236e946b53ffd5e2f5d7e6abebbe72a9f0826d15.tar.xz
linux-236e946b53ffd5e2f5d7e6abebbe72a9f0826d15.zip
Revert "PCI: use ACPI _CRS data by default"
This reverts commit 9e9f46c44e487af0a82eb61b624553e2f7118f5b. Quoting from the commit message: "At this point, it seems to solve more problems than it causes, so let's try using it by default. It's an easy revert if it ends up causing trouble." And guess what? The _CRS code causes trouble. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 040fee607282..d08759aa0903 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1855,7 +1855,7 @@ and is between 256 and 4096 characters. It is defined in the file
IRQ routing is enabled.
noacpi [X86] Do not use ACPI for IRQ routing
or for PCI scanning.
- nocrs [X86] Don't use _CRS for PCI resource
+ use_crs [X86] Use _CRS for PCI resource
allocation.
routeirq Do IRQ routing for all PCI devices.
This is normally done in pci_enable_device(),