From 6bfe8efd7a9401e570c8bf815ce27482beacdab2 Mon Sep 17 00:00:00 2001
From: Jacob Pan <jacob.jun.pan@intel.com>
Date: Mon, 8 Dec 2008 09:44:16 -0800
Subject: [PATCH] --- yaml --- r: 127361 b: refs/heads/master c:
 23a36002742bca87510201770a7d931c4aa63e97 h: refs/heads/master i:   127359:
 3da4efa3c396747c21ef2c31429e4f8f7fe4bce2 v: v3

---
 [refs]                    | 2 +-
 trunk/arch/x86/pci/init.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bafdab234e34..e74b8ddc2a7f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e331bf1c44401a5b6d7b778dd1f254724132dff
+refs/heads/master: 23a36002742bca87510201770a7d931c4aa63e97
diff --git a/trunk/arch/x86/pci/init.c b/trunk/arch/x86/pci/init.c
index bec3b048e72b..25a1f8efed4a 100644
--- a/trunk/arch/x86/pci/init.c
+++ b/trunk/arch/x86/pci/init.c
@@ -12,7 +12,8 @@ static __init int pci_arch_init(void)
 	type = pci_direct_probe();
 #endif
 
-	pci_mmcfg_early_init();
+	if (!(pci_probe & PCI_PROBE_NOEARLY))
+		pci_mmcfg_early_init();
 
 #ifdef CONFIG_PCI_OLPC
 	if (!pci_olpc_init())