diff -urN /mnt/disk/linux/drivers/net/ac3200.c /linux/drivers/net/ac3200.c --- /mnt/disk/linux/drivers/net/ac3200.c Thu Nov 16 22:57:16 2000 +++ /linux/drivers/net/ac3200.c Sun Nov 19 19:55:06 2000 @@ -140,7 +140,7 @@ inb(ioaddr + AC_ID_PORT + 2), inb(ioaddr + AC_ID_PORT + 3)); #endif - printk("AC3200 in EISA slot %d, node", ioaddr/0x1000); + printk(KERN_INFO "AC3200 in EISA slot %d, node", ioaddr/0x1000); for(i = 0; i < 6; i++) printk(" %02x", dev->dev_addr[i] = inb(ioaddr + AC_SA_PROM + i)); @@ -195,7 +195,7 @@ dev->if_port = inb(ioaddr + AC_CONFIG) >> 6; dev->mem_start = config2mem(inb(ioaddr + AC_CONFIG)); - printk("%s: AC3200 at %#3x with %dkB memory at physical address %#lx.\n", + printk(KERN_INFO "%s: AC3200 at %#3x with %dkB memory at physical address %#lx.\n", dev->name, ioaddr, AC_STOP_PG/4, dev->mem_start); /* @@ -220,7 +220,7 @@ goto out2; } ei_status.reg0 = 1; /* Use as remap flag */ - printk("ac3200.c: remapped %dkB card memory to virtual address %#lx\n", + printk(KERN_INFO "ac3200.c: remapped %dkB card memory to virtual address %#lx\n", AC_STOP_PG/4, dev->mem_start); } @@ -235,7 +235,7 @@ ei_status.word16 = 1; if (ei_debug > 0) - printk(version); + printk(KERN_INFO "%s", version); ei_status.reset_8390 = &ac_reset_8390; ei_status.block_input = &ac_block_input; @@ -272,7 +272,7 @@ ushort ioaddr = dev->base_addr; outb(AC_RESET, ioaddr + AC_RESET_PORT); - if (ei_debug > 1) printk("resetting AC3200, t=%ld...", jiffies); + if (ei_debug > 1) printk(KERN_DEBUG "resetting AC3200, t=%ld...", jiffies); ei_status.txing = 0; outb(AC_ENABLE, ioaddr + AC_RESET_PORT); @@ -323,7 +323,7 @@ static int ac_close_card(struct net_device *dev) { if (ei_debug > 1) - printk("%s: Shutting down ethercard.\n", dev->name); + printk(KERN_DEBUG "%s: Shutting down ethercard.\n", dev->name); #ifdef notyet /* We should someday disable shared memory and interrupts. */