1 files changed, 6 insertions, 7 deletions

diff --git a/arch/ia64/sn/kernel/io_common.c b/arch/ia64/sn/kernel/io_common.c
index 4594770e685a..c4eb84f9e781 100644
--- a/arch/ia64/sn/kernel/io_common.c
+++ b/arch/ia64/sn/kernel/io_common.c
@@ -347,7 +347,7 @@ sn_common_bus_fixup(struct pci_bus *bus,
         if (controller->node >= num_online_nodes()) {
                 struct pcibus_bussoft *b = SN_PCIBUS_BUSSOFT(bus);
 
-                printk(KERN_WARNING "Device ASIC=%u XID=%u PBUSNUM=%u"
+                printk(KERN_WARNING "Device ASIC=%u XID=%u PBUSNUM=%u "
                        "L_IO=%lx L_MEM=%lx BASE=%lx\n",
                        b->bs_asic_type, b->bs_xid, b->bs_persist_busnum,
                        b->bs_legacy_io, b->bs_legacy_mem, b->bs_base);
@@ -545,19 +545,18 @@ sn_io_late_init(void)
                 nasid = NASID_GET(bussoft->bs_base);
                 cnode = nasid_to_cnodeid(nasid);
                 if ((bussoft->bs_asic_type == PCIIO_ASIC_TYPE_TIOCP) ||
-                    (bussoft->bs_asic_type == PCIIO_ASIC_TYPE_TIOCE)) {
-                        /* TIO PCI Bridge: find nearest node with CPUs */
+                    (bussoft->bs_asic_type == PCIIO_ASIC_TYPE_TIOCE) ||
+                    (bussoft->bs_asic_type == PCIIO_ASIC_TYPE_PIC)) {
+                        /* PCI Bridge: find nearest node with CPUs */
                         int e = sn_hwperf_get_nearest_node(cnode, NULL,
                                                            &near_cnode);
                         if (e < 0) {
                                 near_cnode = (cnodeid_t)-1; /* use any node */
-                                printk(KERN_WARNING "pcibr_bus_fixup: failed "
-                                       "to find near node with CPUs to TIO "
+                                printk(KERN_WARNING "sn_io_late_init: failed "
+                                       "to find near node with CPUs for "
                                        "node %d, err=%d\n", cnode, e);
                         }
                         PCI_CONTROLLER(bus)->node = near_cnode;
-                } else if (bussoft->bs_asic_type == PCIIO_ASIC_TYPE_PIC) {
-                        PCI_CONTROLLER(bus)->node = cnode;
                 }
         }