diff -urN /mnt/disk/linux/drivers/net/lne390.c /linux/drivers/net/lne390.c
--- /mnt/disk/linux/drivers/net/lne390.c	Thu Nov 16 22:57:26 2000
+++ /linux/drivers/net/lne390.c	Sun Nov 19 20:07:34 2000
@@ -109,7 +109,7 @@
 	int ret;
 
 	if (ioaddr > 0x1ff) {		/* Check a single specified location. */
-		if (!request_region(ioaddr, LNE390_IO_EXTENT, "lne390"))
+		if (!request_region(ioaddr, LNE390_IO_EXTENT, dev->name))
 			return -EBUSY;
 		ret = lne390_probe1(dev, ioaddr);
 		if (ret)
@@ -121,14 +121,14 @@
 
 	if (!EISA_bus) {
 #if LNE390_DEBUG & LNE390_D_PROBE
-		printk("lne390-debug: Not an EISA bus. Not probing high ports.\n");
+		printk(kern_debug "lne390-debug: Not an EISA bus. Not probing high ports.\n");
 #endif
 		return -ENXIO;
 	}
 
 	/* EISA spec allows for up to 16 slots, but 8 is typical. */
 	for (ioaddr = 0x1000; ioaddr < 0x9000; ioaddr += 0x1000) {
-		if (!request_region(ioaddr, LNE390_IO_EXTENT, "lne390"))
+		if (!request_region(ioaddr, LNE390_IO_EXTENT, dev->name))
 			continue;
 		if (lne390_probe1(dev, ioaddr) == 0)
 			return 0;
@@ -146,8 +146,9 @@
 	if (inb_p(ioaddr + LNE390_ID_PORT) == 0xff) return -ENODEV;
 
 #if LNE390_DEBUG & LNE390_D_PROBE
-	printk("lne390-debug: probe at %#x, ID %#8x\n", ioaddr, inl(ioaddr + LNE390_ID_PORT));
-	printk("lne390-debug: config regs: %#x %#x\n",
+	printk(KERN_DEBUG "lne390-debug: probe at %#x, ID %#8x\n", 
+		ioaddr, inl(ioaddr + LNE390_ID_PORT));
+	printk(KERN_DEBUG "lne390-debug: config regs: %#x %#x\n",
 		inb(ioaddr + LNE390_CFG1), inb(ioaddr + LNE390_CFG2));
 #endif
 
@@ -165,7 +166,7 @@
 	if (inb(ioaddr + LNE390_SA_PROM + 0) != LNE390_ADDR0
 		|| inb(ioaddr + LNE390_SA_PROM + 1) != LNE390_ADDR1
 		|| inb(ioaddr + LNE390_SA_PROM + 2) != LNE390_ADDR2 ) {
-		printk("lne390.c: card not found");
+		printk(KERN_WARNING "lne390.c: card not found");
 		for(i = 0; i < ETHER_ADDR_LEN; i++)
 			printk(" %02x", inb(ioaddr + LNE390_SA_PROM + i));
 		printk(" (invalid prefix).\n");
@@ -174,11 +175,11 @@
 #endif
 	/* Allocate dev->priv and fill in 8390 specific dev fields. */
 	if (ethdev_init(dev)) {
-		printk ("lne390.c: unable to allocate memory for dev->priv!\n");
+		printk (KERN_ERR "lne390.c: unable to allocate memory for dev->priv!\n");
 		return -ENOMEM;
 	}
 
-	printk("lne390.c: LNE390%X in EISA slot %d, address", 0xa+revision, ioaddr/0x1000);
+	printk(KERN_INFO "lne390.c: LNE390%X in EISA slot %d, address", 0xa+revision, ioaddr/0x1000);
 	for(i = 0; i < ETHER_ADDR_LEN; i++)
 		printk(" %02x", (dev->dev_addr[i] = inb(ioaddr + LNE390_SA_PROM + i)));
 	printk(".\nlne390.c: ");
@@ -195,11 +196,11 @@
 	}
 	printk(" IRQ %d,", dev->irq);
 
-	if (request_irq(dev->irq, ei_interrupt, 0, "lne390", dev)) {
+	if ((ret = request_irq(dev->irq, ei_interrupt, 0, dev->name, dev))) {
 		printk (" unable to get IRQ %d.\n", dev->irq);
 		kfree(dev->priv);
 		dev->priv = NULL;
-		return -EAGAIN;
+		return ret;
 	}
 
 	if (dev->mem_start == 0) {
@@ -241,7 +242,7 @@
 			goto cleanup;
 		}
 		ei_status.reg0 = 1;	/* Use as remap flag */
-		printk("lne390.c: remapped %dkB card memory to virtual address %#lx\n",
+		printk(KERN_INFO "lne390.c: remapped %dkB card memory to virtual address %#lx\n",
 				LNE390_STOP_PG/4, dev->mem_start);
 	}
 
@@ -259,7 +260,7 @@
 	ei_status.word16 = 1;
 
 	if (ei_debug > 0)
-		printk(version);
+		printk(KERN_INFO "%s", version);
 
 	ei_status.reset_8390 = &lne390_reset_8390;
 	ei_status.block_input = &lne390_block_input;
@@ -287,7 +288,7 @@
 	unsigned short ioaddr = dev->base_addr;
 
 	outb(0x04, ioaddr + LNE390_RESET_PORT);
-	if (ei_debug > 1) printk("%s: resetting the LNE390...", dev->name);
+	if (ei_debug > 1) printk(KERN_DEBUG "%s: resetting the LNE390...", dev->name);
 
 	mdelay(2);
 
@@ -364,7 +365,7 @@
 {
 
 	if (ei_debug > 1)
-		printk("%s: Shutting down ethercard.\n", dev->name);
+		printk(KERN_DEBUG "%s: Shutting down ethercard.\n", dev->name);
 
 	ei_close(dev);
 	MOD_DEC_USE_COUNT;