diff -urN /mnt/disk/linux/drivers/net/hp-plus.c /linux/drivers/net/hp-plus.c
--- /mnt/disk/linux/drivers/net/hp-plus.c	Thu Nov 16 22:57:16 2000
+++ /linux/drivers/net/hp-plus.c	Sun Nov 19 22:18:16 2000
@@ -150,13 +150,13 @@
 	if (inw(ioaddr + HP_ID) != 0x4850
 		|| (inw(ioaddr + HP_PAGING) & 0xfff0) != 0x5300) {
 		retval = -ENODEV;
-		goto out;
+		goto err_out;
 	}
 
 	if (ei_debug  &&  version_printed++ == 0)
-		printk(version);
+		printk(KERN_INFO "%s", version);
 
-	printk("%s: %s at %#3x,", dev->name, name, ioaddr);
+	printk(KERN_INFO "%s: %s at %#3x,", dev->name, name, ioaddr);
 
 	/* Retrieve and checksum the station address. */
 	outw(MAC_Page, ioaddr + HP_PAGING);
@@ -172,7 +172,7 @@
 	if (checksum != 0xff) {
 		printk(" bad checksum %2.2x.\n", checksum);
 		retval = -ENODEV;
-		goto out;
+		goto err_out;
 	} else {
 		/* Point at the Software Configuration Flags. */
 		outw(ID_Page, ioaddr + HP_PAGING);
@@ -181,9 +181,9 @@
 
 	/* Allocate dev->priv and fill in 8390 specific dev fields. */
 	if (ethdev_init(dev)) {
-		printk ("hp-plus.c: unable to allocate memory for dev->priv.\n");
+		printk (KERN_INFO "hp-plus.c: unable to allocate memory for dev->priv.\n");
 		retval = -ENOMEM;
-		goto out;
+		goto err_out;
 	 }
 
 	/* Read the IRQ line. */
@@ -239,7 +239,8 @@
 	outw(inw(ioaddr + HPP_OPTION) & ~EnableIRQ, ioaddr + HPP_OPTION);
 
 	return 0;
-out:
+
+err_out:
 	release_region(ioaddr, HP_IO_EXTENT);
 	return retval;
 }
@@ -295,7 +296,8 @@
 	int ioaddr = dev->base_addr - NIC_OFFSET;
 	int option_reg = inw(ioaddr + HPP_OPTION);
 
-	if (ei_debug > 1) printk("resetting the 8390 time=%ld...", jiffies);
+	if (ei_debug > 1)
+		printk(KERN_DEBUG "resetting the 8390 time=%ld...", jiffies);
 
 	outw(option_reg & ~(NICReset + ChipReset), ioaddr + HPP_OPTION);
 	/* Pause a few cycles for the hardware reset to take place. */
@@ -307,9 +309,9 @@
 
 
 	if ((inb_p(ioaddr+NIC_OFFSET+EN0_ISR) & ENISR_RESET) == 0)
-		printk("%s: hp_reset_8390() did not complete.\n", dev->name);
+		printk(KERN_WARNING "%s: hp_reset_8390() did not complete.\n", dev->name);
 
-	if (ei_debug > 1) printk("8390 reset done (%ld).", jiffies);
+	if (ei_debug > 1) printk(KERN_DEBUG "8390 reset done (%ld).", jiffies);
 	return;
 }