From 713a672deba687b45ed19e3f777f431702f2e55b Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Thu, 20 Dec 2007 14:55:00 +1100
Subject: [PATCH] --- yaml --- r: 81123 b: refs/heads/master c:
 bcf988a19458f08950551f66c110e41fac452b2b h: refs/heads/master i:   81121:
 b9b4bd2f0ace49aff1cadb3c5c537edddf3d7aa6   81119:
 ac6bb28522c80b419bf0e45251072208737f82e9 v: v3

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

diff --git a/[refs] b/[refs]
index 27b0530ff1e2..588318ea7490 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 295f83e7aaa87d52b8d16077225a90dab61df45a
+refs/heads/master: bcf988a19458f08950551f66c110e41fac452b2b
diff --git a/trunk/arch/powerpc/kernel/pci-common.c b/trunk/arch/powerpc/kernel/pci-common.c
index 8935661d12d0..b6d4767e4e27 100644
--- a/trunk/arch/powerpc/kernel/pci-common.c
+++ b/trunk/arch/powerpc/kernel/pci-common.c
@@ -1147,7 +1147,10 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
 		r = &dev->resource[idx];
 		if (!(r->flags & (IORESOURCE_IO | IORESOURCE_MEM)))
 			continue;
-		if (r->flags & IORESOURCE_UNSET) {
+		if ((idx == PCI_ROM_RESOURCE) &&
+				(!(r->flags & IORESOURCE_ROM_ENABLE)))
+			continue;
+		if (r->parent == NULL) {
 			printk(KERN_ERR "PCI: Device %s not available because"
 			       " of resource collisions\n", pci_name(dev));
 			return -EINVAL;