Commit-ID: a6c3270b04340c5e0d47af5bdb10f30d33333739 Gitweb: http://git.kernel.org/tip/a6c3270b04340c5e0d47af5bdb10f30d33333739 Author: Lucas De Marchi <lucas.de.marchi@xxxxxxxxx> AuthorDate: Thu, 17 Mar 2011 16:24:15 -0300 Committer: Ingo Molnar <mingo@xxxxxxx> CommitDate: Fri, 18 Mar 2011 10:39:30 +0100 x86: Fix misspelling and align params Fix 'upto' misspelling and align parameters. Signed-off-by: Lucas De Marchi <lucas.demarchi@xxxxxxxxxxxxxx> Cc: trivial@xxxxxxxxxx LKML-Reference: <1300389856-1099-2-git-send-email-lucas.demarchi@xxxxxxxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxx> --- Documentation/x86/x86_64/boot-options.txt | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Documentation/x86/x86_64/boot-options.txt b/Documentation/x86/x86_64/boot-options.txt index 7fbbaf8..48c13b8 100644 --- a/Documentation/x86/x86_64/boot-options.txt +++ b/Documentation/x86/x86_64/boot-options.txt @@ -189,13 +189,13 @@ ACPI PCI - pci=off Don't use PCI - pci=conf1 Use conf1 access. - pci=conf2 Use conf2 access. - pci=rom Assign ROMs. - pci=assign-busses Assign busses - pci=irqmask=MASK Set PCI interrupt mask to MASK - pci=lastbus=NUMBER Scan upto NUMBER busses, no matter what the mptable says. + pci=off Don't use PCI + pci=conf1 Use conf1 access. + pci=conf2 Use conf2 access. + pci=rom Assign ROMs. + pci=assign-busses Assign busses + pci=irqmask=MASK Set PCI interrupt mask to MASK + pci=lastbus=NUMBER Scan up to NUMBER busses, no matter what the mptable says. pci=noacpi Don't use ACPI to set up PCI interrupt routing. IOMMU (input/output memory management unit) -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|