diff -urN -X /home/venza/kernel/dontdiff linux-2.5.64/drivers/net/hp.c linux-2.5.64-work/drivers/net/hp.c --- linux-2.5.64/drivers/net/hp.c 2002-11-30 15:07:12.000000000 +0100 +++ linux-2.5.64-work/drivers/net/hp.c 2003-03-13 12:52:11.000000000 +0100 @@ -129,19 +129,19 @@ } if (ei_debug && version_printed++ == 0) - printk(version); + printk(KERN_INFO version); /* Allocate dev->priv and fill in 8390 specific dev fields. */ if (ethdev_init(dev)) { - printk (" unable to get memory for dev->priv.\n"); + printk (KERN_ERR " unable to get memory for dev->priv.\n"); retval = -ENOMEM; goto out; } - printk("%s: %s (ID %02x) at %#3x,", dev->name, name, board_id, ioaddr); + printk(KERN_INFO "%s: %s (ID %02x) at %#3x,", dev->name, name, board_id, ioaddr); for(i = 0; i < ETHER_ADDR_LEN; i++) - printk(" %2.2x", dev->dev_addr[i] = inb(ioaddr + i)); + printk(KERN_INFO " %2.2x", dev->dev_addr[i] = inb(ioaddr + i)); /* Snarf the interrupt now. Someday this could be moved to open(). */ if (dev->irq < 2) { @@ -157,14 +157,14 @@ outb_p( 0x00 | HP_RUN, ioaddr + HP_CONFIGURE); if (irq == probe_irq_off(cookie) /* It's a good IRQ line! */ && request_irq (irq, ei_interrupt, 0, dev->name, dev) == 0) { - printk(" selecting IRQ %d.\n", irq); + printk(KERN_INFO " selecting IRQ %d.\n", irq); dev->irq = *irqp; break; } } } while (*++irqp); if (*irqp == 0) { - printk(" no free IRQ lines.\n"); + printk(KERN_ERR " no free IRQ lines.\n"); retval = -EBUSY; goto out1; } @@ -172,7 +172,7 @@ if (dev->irq == 2) dev->irq = 9; if ((retval = request_irq(dev->irq, ei_interrupt, 0, dev->name, dev))) { - printk (" unable to get IRQ %d.\n", dev->irq); + printk (KERN_ERR " unable to get IRQ %d.\n", dev->irq); goto out1; } } @@ -223,7 +223,7 @@ int hp_base = dev->base_addr - NIC_OFFSET; int saved_config = inb_p(hp_base + HP_CONFIGURE); - if (ei_debug > 1) printk("resetting the 8390 time=%ld...", jiffies); + if (ei_debug > 1) printk(KERN_DEBUG "resetting the 8390 time=%ld...", jiffies); outb_p(0x00, hp_base + HP_CONFIGURE); ei_status.txing = 0; /* Pause just a few cycles for the hardware reset to take place. */ @@ -233,9 +233,9 @@ udelay(5); if ((inb_p(hp_base+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; } @@ -295,7 +295,7 @@ int addr = (high << 8) + low; /* Check only the lower 8 bits so we can ignore ring wrap. */ if (((ring_offset + xfer_count) & 0xff) != (addr & 0xff)) - printk("%s: RX transfer address mismatch, %#4.4x vs. %#4.4x (actual).\n", + printk(KERN_WARNING "%s: RX transfer address mismatch, %#4.4x vs. %#4.4x (actual).\n", dev->name, ring_offset + xfer_count, addr); } outb_p(saved_config & (~HP_DATAON), nic_base - NIC_OFFSET + HP_CONFIGURE); @@ -352,7 +352,7 @@ int low = inb_p(nic_base + EN0_RSARLO); int addr = (high << 8) + low; if ((start_page << 8) + count != addr) - printk("%s: TX Transfer address mismatch, %#4.4x vs. %#4.4x.\n", + printk(KERN_WARNING "%s: TX Transfer address mismatch, %#4.4x vs. %#4.4x.\n", dev->name, (start_page << 8) + count, addr); } outb_p(saved_config & (~HP_DATAON), nic_base - NIC_OFFSET + HP_CONFIGURE); diff -urN -X /home/venza/kernel/dontdiff linux-2.5.64/drivers/net/slhc.c linux-2.5.64-work/drivers/net/slhc.c --- linux-2.5.64/drivers/net/slhc.c 2003-03-06 11:41:21.000000000 +0100 +++ linux-2.5.64-work/drivers/net/slhc.c 2003-03-13 12:47:40.000000000 +0100 @@ -696,7 +696,7 @@ void slhc_i_status(struct slcompress *comp) { if (comp != NULLSLCOMPR) { - printk("\t%d Cmp, %d Uncmp, %d Bad, %d Tossed\n", + printk(KERN_INFO "\t%d Cmp, %d Uncmp, %d Bad, %d Tossed\n", comp->sls_i_compressed, comp->sls_i_uncompressed, comp->sls_i_error, @@ -708,12 +708,12 @@ void slhc_o_status(struct slcompress *comp) { if (comp != NULLSLCOMPR) { - printk("\t%d Cmp, %d Uncmp, %d AsIs, %d NotTCP\n", + printk(KERN_INFO "\t%d Cmp, %d Uncmp, %d AsIs, %d NotTCP\n", comp->sls_o_compressed, comp->sls_o_uncompressed, comp->sls_o_tcp, comp->sls_o_nontcp); - printk("\t%10d Searches, %10d Misses\n", + printk(KERN_INFO "\t%10d Searches, %10d Misses\n", comp->sls_o_searches, comp->sls_o_misses); }