diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-23 11:28:13 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-23 11:28:13 +1000 |
| commit | eff78d9542e1749137822f83283eed90b9da3070 (patch) | |
| tree | c210d2f729265593f8435fe2f3a0d4e8079b53a3 /Documentation | |
| parent | a7a6814369a8f011b68ad1eea960c7cdd784d9c9 (diff) | |
| parent | a797e45c25b1ba0fd9e9c0de8bf8cb5be58490e5 (diff) | |
Merge remote branch 'pci/linux-next'
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 4ddb58df081e..08a80dc918de 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -1970,6 +1970,8 @@ and is between 256 and 4096 characters. It is defined in the file norom [X86] Do not assign address space to expansion ROMs that do not already have BIOS assigned address ranges. + nobar [X86] Do not assign address space to the + BARs that weren't assigned by the BIOS. irqmask=0xMMMM [X86] Set a bit mask of IRQs allowed to be assigned automatically to PCI devices. You can make the kernel exclude IRQs of your ISA cards |