Merge branch 'master' into upstream

1 files changed, 7 insertions, 2 deletions

diff --git a/arch/i386/pci/init.c b/arch/i386/pci/init.c
index 51087a9d9172..d028e1b05c36 100644
--- a/arch/i386/pci/init.c
+++ b/arch/i386/pci/init.c
@@ -6,8 +6,13 @@
    in the right sequence from here. */
 static __init int pci_access_init(void)
 {
+        int type = 0;
+
+#ifdef CONFIG_PCI_DIRECT
+        type = pci_direct_probe();
+#endif
 #ifdef CONFIG_PCI_MMCONFIG
-        pci_mmcfg_init();
+        pci_mmcfg_init(type);
 #endif
         if (raw_pci_ops)
                 return 0;
@@ -21,7 +26,7 @@ static __init int pci_access_init(void)
          * fails.
          */
 #ifdef CONFIG_PCI_DIRECT
-        pci_direct_init();
+        pci_direct_init(type);
 #endif
         return 0;
 }