diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-05 12:39:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-05 12:39:10 -0700 |
| commit | 108c1961847df2a875047c0fd27b419cb817d213 (patch) | |
| tree | 5138948168df7043b1d39a1dbeb4a472f1cd66da /arch/x86/pci/init.c | |
| parent | 48fc8de9cd093b8c9e2cfa339421862bae3a6cad (diff) | |
| parent | 0df18ff366853cdf31e5238764ec5c63e6b5a398 (diff) | |
| download | kernel-crypto-108c1961847df2a875047c0fd27b419cb817d213.tar.gz kernel-crypto-108c1961847df2a875047c0fd27b419cb817d213.tar.xz kernel-crypto-108c1961847df2a875047c0fd27b419cb817d213.zip | |
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 'arch/x86/pci/init.c')
| -rw-r--r-- | arch/x86/pci/init.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/pci/init.c b/arch/x86/pci/init.c index dd30c6076b5..e70b9c57b88 100644 --- a/arch/x86/pci/init.c +++ b/arch/x86/pci/init.c @@ -33,6 +33,10 @@ static __init int pci_access_init(void) printk(KERN_ERR "PCI: Fatal: No config space access function found\n"); + dmi_check_pciprobe(); + + dmi_check_skip_isa_align(); + return 0; } arch_initcall(pci_access_init); |