From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 18 Jul 2008 20:39:59 +0000 (+0200)
Subject: Merge branch 'linus' into pci-for-jesse
X-Git-Tag: v2.6.27-rc4~36^2^2^2~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0679c2f47d50651018dd5e0bf35330f6e6ae35ec;p=linux-2.6

Merge branch 'linus' into pci-for-jesse
---

0679c2f47d50651018dd5e0bf35330f6e6ae35ec
diff --cc drivers/pci/probe.c
index 27cdbb06c4,b1724cf31b..d2bd74ee3e
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@@ -275,11 -275,10 +275,11 @@@ static void pci_read_bases(struct pci_d
  			}
  			res->start = l64 & PCI_BASE_ADDRESS_MEM_MASK;
  			res->end = res->start + sz64;
 +			printk(KERN_INFO "PCI: %s reg %x 64bit mmio: [%llx, %llx]\n", pci_name(dev), reg, res->start, res->end);
  #else
  			if (sz64 > 0x100000000ULL) {
- 				printk(KERN_ERR "PCI: Unable to handle 64-bit "
- 					"BAR for device %s\n", pci_name(dev));
+ 				dev_err(&dev->dev, "BAR %d: can't handle 64-bit"
+ 					" BAR\n", pos);
  				res->start = 0;
  				res->flags = 0;
  			} else if (lhi) {