From d13d9992f409274f8ae1ce0b6eece0988828216b Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Mon, 22 Mar 2010 16:34:15 -0600
Subject: [PATCH] --- yaml --- r: 189127 b: refs/heads/master c:
 99f4692e13ba22b228bdd155473f24ae9bdec1dc h: refs/heads/master i:   189125:
 e454e0fd00d2bdb2dab27dcb22ea41565ed0ae10   189123:
 0a39247c9069cc1c6540d690458443373cd59760   189119:
 7b2fb55c5cb2fe165abf88160145e2109bee4ba8 v: v3

---
 [refs]                                | 2 +-
 trunk/arch/frv/mb93090-mb00/pci-frv.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 33f71b88951c..4b23f3b99e04 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9c9b564717e5b6b2ae8b770da1c73a348c84cce
+refs/heads/master: 99f4692e13ba22b228bdd155473f24ae9bdec1dc
diff --git a/trunk/arch/frv/mb93090-mb00/pci-frv.c b/trunk/arch/frv/mb93090-mb00/pci-frv.c
index 1ed15d7fea20..16bc2cb5649a 100644
--- a/trunk/arch/frv/mb93090-mb00/pci-frv.c
+++ b/trunk/arch/frv/mb93090-mb00/pci-frv.c
@@ -94,8 +94,7 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list)
 				r = &dev->resource[idx];
 				if (!r->start)
 					continue;
-				if (pci_claim_resource(dev, idx) < 0)
-					printk(KERN_ERR "PCI: Cannot allocate resource region %d of bridge %s\n", idx, pci_name(dev));
+				pci_claim_resource(dev, idx);
 			}
 		}
 		pcibios_allocate_bus_resources(&bus->children);
@@ -125,7 +124,6 @@ static void __init pcibios_allocate_resources(int pass)
 				DBG("PCI: Resource %08lx-%08lx (f=%lx, d=%d, p=%d)\n",
 				    r->start, r->end, r->flags, disabled, pass);
 				if (pci_claim_resource(dev, idx) < 0) {
-					printk(KERN_ERR "PCI: Cannot allocate resource region %d of device %s\n", idx, pci_name(dev));
 					/* We'll assign a new address later */
 					r->end -= r->start;
 					r->start = 0;