From 36e0abee3c23dc585253fb72eb1c1e93a7f95dc6 Mon Sep 17 00:00:00 2001
From: Kumar Gala <galak@kernel.crashing.org>
Date: Sat, 12 Jan 2008 17:23:26 -0600
Subject: [PATCH] --- yaml --- r: 81275 b: refs/heads/master c:
 96d69c31c5115341c6c1163aa3d591c2da687a76 h: refs/heads/master i:   81273:
 1b8d2cabad44821f14fb33515ded950204ba45ef   81271:
 8520a25aa815cc8e897216b5e338a4ede619ba51 v: v3

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

diff --git a/[refs] b/[refs]
index 15287d5492db..db04ee94ba64 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f98eeb4eb1c52de89dcefeb538029bcecc6dd42d
+refs/heads/master: 96d69c31c5115341c6c1163aa3d591c2da687a76
diff --git a/trunk/arch/powerpc/kernel/pci-common.c b/trunk/arch/powerpc/kernel/pci-common.c
index d394d41b61d5..7d0afd47b3e0 100644
--- a/trunk/arch/powerpc/kernel/pci-common.c
+++ b/trunk/arch/powerpc/kernel/pci-common.c
@@ -806,7 +806,8 @@ static void __devinit __pcibios_fixup_bus(struct pci_bus *bus)
 			 * equal to the pci_mem_offset of the host bridge and
 			 * their size is smaller than 1M.
 			 */
-			if (res->start == hose->pci_mem_offset &&
+			if (res->flags & IORESOURCE_MEM &&
+			    res->start == hose->pci_mem_offset &&
 			    res->end < 0x100000) {
 				printk(KERN_INFO
 				       "PCI: Closing bogus Apple Firmware"