Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 150574
b: refs/heads/master
c: cd39c7a
h: refs/heads/master
v: v3
  • Loading branch information
Finn Thain authored and David S. Miller committed May 30, 2009
1 parent 627cc58 commit 5dad0b3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 14 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ccffad25b5136958d4769ed6de5e87992dd9c65c
refs/heads/master: cd39c7a5717191c677a140565bda2f1ca485ecd8
19 changes: 6 additions & 13 deletions trunk/drivers/net/mac8390.c
Original file line number Diff line number Diff line change
Expand Up @@ -620,19 +620,12 @@ static int __init mac8390_initdev(struct net_device * dev, struct nubus_dev * nd

/* Good, done, now spit out some messages */
printk(KERN_INFO "%s: %s in slot %X (type %s)\n",
dev->name, ndev->board->name, ndev->board->slot, cardname[type]);
printk(KERN_INFO "MAC ");
{
int i;
for (i = 0; i < 6; i++) {
printk("%2.2x", dev->dev_addr[i]);
if (i < 5)
printk(":");
}
}
printk(" IRQ %d, %d KB shared memory at %#lx, %d-bit access.\n",
dev->irq, (int)((dev->mem_end - dev->mem_start)/0x1000) * 4,
dev->mem_start, access_bitmode?32:16);
dev->name, ndev->board->name, ndev->board->slot, cardname[type]);
printk(KERN_INFO
"MAC %pM IRQ %d, %d KB shared memory at %#lx, %d-bit access.\n",
dev->dev_addr, dev->irq,
(unsigned int)(dev->mem_end - dev->mem_start) >> 10,
dev->mem_start, access_bitmode ? 32 : 16);
return 0;
}

Expand Down

0 comments on commit 5dad0b3

Please sign in to comment.