diff options
Diffstat (limited to 'arch/x86/pci/init.c')
| -rw-r--r-- | arch/x86/pci/init.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/pci/init.c b/arch/x86/pci/init.c index dd30c6076b5d..b821f4462d99 100644 --- a/arch/x86/pci/init.c +++ b/arch/x86/pci/init.c @@ -15,7 +15,8 @@ static __init int pci_access_init(void) pci_mmcfg_early_init(); #ifdef CONFIG_PCI_OLPC - pci_olpc_init(); + if (!pci_olpc_init()) + return 0; /* skip additional checks if it's an XO */ #endif #ifdef CONFIG_PCI_BIOS pci_pcbios_init(); @@ -33,6 +34,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); |