---

yaml --- r: 81275 b: refs/heads/master c: 96d69c3 h: refs/heads/master i: 81273: 1b8d2ca 81271: 8520a25 v: v3
git-mirror · Jan 24, 2008 · 36e0abe · 36e0abe
1 parent d545a5c
commit 36e0abe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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"