From d0b40733e5cb1d6e99d0ac6b10b26dc3c0e24817 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Tue, 11 Dec 2007 14:48:21 +1100 Subject: [PATCH] --- yaml --- r: 81041 b: refs/heads/master c: 6d39635959fe2f072130789a95e11ff97fb27b58 h: refs/heads/master i: 81039: ac1ff1ca6a6bc8e897beaffdc5a9dbb017ce3de8 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/pci_32.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 09ad66019dc2..5d901bb60ca3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 05d3957e110c46b8c613214d68705bc97d9c6609 +refs/heads/master: 6d39635959fe2f072130789a95e11ff97fb27b58 diff --git a/trunk/arch/powerpc/kernel/pci_32.c b/trunk/arch/powerpc/kernel/pci_32.c index 03a7dc494b42..190b1a250530 100644 --- a/trunk/arch/powerpc/kernel/pci_32.c +++ b/trunk/arch/powerpc/kernel/pci_32.c @@ -508,7 +508,7 @@ static inline void alloc_resource(struct pci_dev *dev, int idx) pci_name(dev), idx, (u64)r->start, (u64)r->end, r->flags); pr = pci_find_parent_resource(dev, r); if (!pr || request_resource(pr, r) < 0) { - printk(KERN_ERR "PCI: Cannot allocate resource region %d" + printk(KERN_WARNING "PCI: Remapping resource region %d" " of device %s\n", idx, pci_name(dev)); if (pr) DBG("PCI: parent is %p: %016llx-%016llx (f=%lx)\n",