Merge branch 'sched/urgent' into sched/clock

[linux-2.6-omap-h63xx.git] / arch / x86 / pci / numaq_32.c

diff --git a/arch/x86/pci/numaq_32.c b/arch/x86/pci/numaq_32.c
index 8b5ca1966731a6fd5bd2642696367e99fc12e1f6..1177845d31863602e9bf0dbf8bc4e031db3f6487 100644 (file)
--- a/arch/x86/pci/numaq_32.c
+++ b/arch/x86/pci/numaq_32.c
@@ -1,5 +1,5 @@
 /*
- * numa.c - Low-level PCI access for NUMA-Q machines
+ * numaq_32.c - Low-level PCI access for NUMA-Q machines
  */
 
 #include <linux/pci.h>
@@ -131,13 +131,14 @@ static void __devinit pci_fixup_i450nx(struct pci_dev *d)
        u8 busno, suba, subb;
        int quad = BUS2QUAD(d->bus->number);
 
-       printk("PCI: Searching for i450NX host bridges on %s\n", pci_name(d));
+       dev_info(&d->dev, "searching for i450NX host bridges\n");
        reg = 0xd0;
        for(pxb=0; pxb<2; pxb++) {
                pci_read_config_byte(d, reg++, &busno);
                pci_read_config_byte(d, reg++, &suba);
                pci_read_config_byte(d, reg++, &subb);
-               DBG("i450NX PXB %d: %02x/%02x/%02x\n", pxb, busno, suba, subb);
+               dev_dbg(&d->dev, "i450NX PXB %d: %02x/%02x/%02x\n",
+                       pxb, busno, suba, subb);
                if (busno) {
                        /* Bus A */
                        pci_scan_bus_with_sysdata(QUADLOCAL2BUS(quad, busno));
@@ -151,7 +152,7 @@ static void __devinit pci_fixup_i450nx(struct pci_dev *d)
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82451NX, pci_fixup_i450nx);
 
-int __init pci_numa_init(void)
+int __init pci_numaq_init(void)
 {
        int quad;