diff --git a/[refs] b/[refs] index c29cf7cfef80..7189f69e7c5c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: faf9b616325430422fa13fead88ca7843eb249d6 +refs/heads/master: 954c0b7cd5b9aaa11fb67a0c011fcb5e5897385a diff --git a/trunk/arch/i386/pci/init.c b/trunk/arch/i386/pci/init.c index c7650a7e0b07..51087a9d9172 100644 --- a/trunk/arch/i386/pci/init.c +++ b/trunk/arch/i386/pci/init.c @@ -14,8 +14,12 @@ static __init int pci_access_init(void) #ifdef CONFIG_PCI_BIOS pci_pcbios_init(); #endif - if (raw_pci_ops) - return 0; + /* + * don't check for raw_pci_ops here because we want pcbios as last + * fallback, yet it's needed to run first to set pcibios_last_bus + * in case legacy PCI probing is used. otherwise detecting peer busses + * fails. + */ #ifdef CONFIG_PCI_DIRECT pci_direct_init(); #endif