From 27a4537eed7dee74c39c4ceab6d3187b476e3bb5 Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Mon, 26 Sep 2011 14:22:39 +1000
Subject: [PATCH] --- yaml --- r: 274205 b: refs/heads/master c:
 bb36c44557a4fcbaa17c0f2776e12a05a691b432 h: refs/heads/master i:   274203:
 86c566298ae8089f4bd99ab0edad94b618a1dcc9 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/powerpc/kernel/pci-common.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 87c81f0b3409..7d7581a7426f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d12b524f8b2f4e45cabe8bc1501e8b967d543111
+refs/heads/master: bb36c44557a4fcbaa17c0f2776e12a05a691b432
diff --git a/trunk/arch/powerpc/kernel/pci-common.c b/trunk/arch/powerpc/kernel/pci-common.c
index 1bd47f36b25f..677ecccbe10d 100644
--- a/trunk/arch/powerpc/kernel/pci-common.c
+++ b/trunk/arch/powerpc/kernel/pci-common.c
@@ -1732,7 +1732,7 @@ void __devinit pcibios_scan_phb(struct pci_controller *hose)
 		hose->last_busno = bus->subordinate = pci_scan_child_bus(bus);
 
 	/* Configure PCI Express settings */
-	if (bus) {
+	if (bus && !pci_has_flag(PCI_PROBE_ONLY)) {
 		struct pci_bus *child;
 		list_for_each_entry(child, &bus->children, node) {
 			struct pci_dev *self = child->self;