diff -urN -X /home/venza/kernel/dontdiff linux-2.5.64/drivers/net/8390.c linux-2.5.64-work/drivers/net/8390.c --- linux-2.5.64/drivers/net/8390.c 2003-03-06 11:41:18.000000000 +0100 +++ linux-2.5.64-work/drivers/net/8390.c 2003-03-13 12:43:54.000000000 +0100 @@ -430,7 +430,7 @@ if (dev == NULL) { - printk ("net_interrupt(): irq %d for unknown device.\n", irq); + printk (KERN_INFO "net_interrupt(): irq %d for unknown device.\n", irq); return; } @@ -448,8 +448,8 @@ #if 1 /* This might just be an interrupt for a PCI device sharing this line */ /* The "irqlock" check is only for testing. */ printk(ei_local->irqlock - ? "%s: Interrupted while interrupts are masked! isr=%#2x imr=%#2x.\n" - : "%s: Reentering the interrupt handler! isr=%#2x imr=%#2x.\n", + ? KERN_DEBUG "%s: Interrupted while interrupts are masked! isr=%#2x imr=%#2x.\n" + : KERN_DEBUG "%s: Reentering the interrupt handler! isr=%#2x imr=%#2x.\n", dev->name, inb_p(e8390_base + EN0_ISR), inb_p(e8390_base + EN0_IMR)); #endif @@ -547,15 +547,15 @@ #ifdef VERBOSE_ERROR_DUMP printk(KERN_DEBUG "%s: transmitter error (%#2x): ", dev->name, txsr); if (txsr & ENTSR_ABT) - printk("excess-collisions "); + printk(KERN_DEBUG "excess-collisions "); if (txsr & ENTSR_ND) - printk("non-deferral "); + printk(KERN_DEBUG "non-deferral "); if (txsr & ENTSR_CRS) - printk("lost-carrier "); + printk(KERN_DEBUG "lost-carrier "); if (txsr & ENTSR_FU) - printk("FIFO-underrun "); + printk(KERN_DEBUG "FIFO-underrun "); if (txsr & ENTSR_CDH) - printk("lost-heartbeat "); + printk(KERN_DEBUG "lost-heartbeat "); printk("\n"); #endif @@ -615,7 +615,7 @@ else if (ei_local->tx2 < 0) { if (ei_local->lasttx != 2 && ei_local->lasttx != -2) - printk("%s: bogus last_tx_buffer %d, tx2=%d.\n", + printk(KERN_ERR "%s: bogus last_tx_buffer %d, tx2=%d.\n", ei_local->name, ei_local->lasttx, ei_local->tx2); ei_local->tx2 = 0; if (ei_local->tx1 > 0) @@ -782,7 +782,7 @@ /* This _should_ never happen: it's here for avoiding bad clones. */ if (next_frame >= ei_local->stop_page) { - printk("%s: next frame inconsistency, %#2x\n", dev->name, + printk(KERN_ERR "%s: next frame inconsistency, %#2x\n", dev->name, next_frame); next_frame = ei_local->rx_start_page; } @@ -1008,7 +1008,7 @@ int ethdev_init(struct net_device *dev) { if (ei_debug > 1) - printk(version); + printk(KERN_DEBUG version); if (dev->priv == NULL) {