diff options
| author | Linus Torvalds | 2008-05-05 12:39:10 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2008-05-05 12:39:10 -0700 |
| commit | 108c1961847df2a875047c0fd27b419cb817d213 (patch) | |
| tree | 5138948168df7043b1d39a1dbeb4a472f1cd66da /Documentation | |
| parent | 48fc8de9cd093b8c9e2cfa339421862bae3a6cad (diff) | |
| parent | 0df18ff366853cdf31e5238764ec5c63e6b5a398 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
x86 PCI: call dmi_check_pciprobe()
x86/pci: add pci=skip_isa_align command lines.
x86/pci: remove flag in pci_cfg_space_size_ext
x86: fix section mismatch in pci_scan_bus
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 b2dd3dc32fd3..cdd5b934f43e 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -1522,6 +1522,8 @@ and is between 256 and 4096 characters. It is defined in the file This is normally done in pci_enable_device(), so this option is a temporary workaround for broken drivers that don't call it. + skip_isa_align [X86] do not align io start addr, so can + handle more pci cards firmware [ARM] Do not re-enumerate the bus but instead just use the configuration from the bootloader. This is currently used on |