Index: drivers/net/acenic.c
===================================================================
RCS file: /var/cvs/linux-2.6/drivers/net/acenic.c,v
retrieving revision 1.7
diff -u -p -r1.7 acenic.c
--- a/drivers/net/acenic.c	28 Feb 2004 01:50:48 -0000	1.7
+++ b/drivers/net/acenic.c	14 Apr 2004 06:13:56 -0000
@@ -737,41 +737,41 @@ int __devinit acenic_probe (ACE_PROBE_AR
 				strncpy(ap->name, "Farallon PN9100-T "
 					"Gigabit Ethernet", sizeof (ap->name));
 				printk(KERN_INFO "%s: Farallon PN9100-T ",
-				       dev->name);
+				       pdev->slot_name);
 			} else {
 				strncpy(ap->name, "AceNIC Gigabit Ethernet",
 					sizeof (ap->name));
 				printk(KERN_INFO "%s: Alteon AceNIC ",
-				       dev->name);
+				       pdev->slot_name);
 			}
 			break;
 		case PCI_VENDOR_ID_3COM:
 			strncpy(ap->name, "3Com 3C985 Gigabit Ethernet",
 				sizeof (ap->name));
-			printk(KERN_INFO "%s: 3Com 3C985 ", dev->name);
+			printk(KERN_INFO "%s: 3Com 3C985 ", pdev->slot_name);
 			break;
 		case PCI_VENDOR_ID_NETGEAR:
 			strncpy(ap->name, "NetGear GA620 Gigabit Ethernet",
 				sizeof (ap->name));
-			printk(KERN_INFO "%s: NetGear GA620 ", dev->name);
+			printk(KERN_INFO "%s: NetGear GA620 ", pdev->slot_name);
 			break;
 		case PCI_VENDOR_ID_DEC:
 			if (pdev->device == PCI_DEVICE_ID_FARALLON_PN9000SX) {
 				strncpy(ap->name, "Farallon PN9000-SX "
 					"Gigabit Ethernet", sizeof (ap->name));
 				printk(KERN_INFO "%s: Farallon PN9000-SX ",
-				       dev->name);
+				       pdev->slot_name);
 				break;
 			}
 		case PCI_VENDOR_ID_SGI:
 			strncpy(ap->name, "SGI AceNIC Gigabit Ethernet",
 				sizeof (ap->name));
-			printk(KERN_INFO "%s: SGI AceNIC ", dev->name);
+			printk(KERN_INFO "%s: SGI AceNIC ", pdev->slot_name);
 			break;
 		default:
  			strncpy(ap->name, "Unknown AceNIC based Gigabit "
 				"Ethernet", sizeof (ap->name));
-			printk(KERN_INFO "%s: Unknown AceNIC ", dev->name);
+			printk(KERN_INFO "%s: Unknown AceNIC ", pdev->slot_name);
 			break;
 		}
 		ap->name [sizeof (ap->name) - 1] = '\0';
@@ -785,7 +785,7 @@ int __devinit acenic_probe (ACE_PROBE_AR
 #ifdef CONFIG_ACENIC_OMIT_TIGON_I
 		if ((readl(&ap->regs->HostCtrl) >> 28) == 4) {
 			printk(KERN_ERR "%s: Driver compiled without Tigon I"
-			       " support - NIC disabled\n", dev->name);
+			       " support - NIC disabled\n", pdev->slot_name);
 			ace_init_cleanup(dev);
 			free_netdev(dev);
 			continue;