diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-02-07 14:05:13 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-02-07 14:05:13 +1100 |
| commit | 8423200553113cc031caa9b147f6150a8e26545c (patch) | |
| tree | 752c93a200c9ba056c7469c96f7e27d02c99291d /drivers/net/82596.c | |
| parent | f03e64f2ca6ee3d0b7824536b1940497701fe766 (diff) | |
| parent | 62d0cfcb27cf755cebdc93ca95dabc83608007cd (diff) | |
| download | blackbird-op-linux-8423200553113cc031caa9b147f6150a8e26545c.tar.gz blackbird-op-linux-8423200553113cc031caa9b147f6150a8e26545c.zip | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/net/82596.c')
| -rw-r--r-- | drivers/net/82596.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/82596.c b/drivers/net/82596.c index 8236f26ffd46..640d7ca2ebcf 100644 --- a/drivers/net/82596.c +++ b/drivers/net/82596.c @@ -1066,8 +1066,8 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev) short length = skb->len; dev->trans_start = jiffies; - DEB(DEB_STARTTX,printk(KERN_DEBUG "%s: i596_start_xmit(%x,%x) called\n", dev->name, - skb->len, (unsigned int)skb->data)); + DEB(DEB_STARTTX,printk(KERN_DEBUG "%s: i596_start_xmit(%x,%p) called\n", + dev->name, skb->len, skb->data)); if (skb->len < ETH_ZLEN) { if (skb_padto(skb, ETH_ZLEN)) @@ -1246,7 +1246,8 @@ struct net_device * __init i82596_probe(int unit) dev->priv = (void *)(dev->mem_start); lp = dev->priv; - DEB(DEB_INIT,printk(KERN_DEBUG "%s: lp at 0x%08lx (%d bytes), lp->scb at 0x%08lx\n", + DEB(DEB_INIT,printk(KERN_DEBUG "%s: lp at 0x%08lx (%zd bytes), " + "lp->scb at 0x%08lx\n", dev->name, (unsigned long)lp, sizeof(struct i596_private), (unsigned long)&lp->scb)); memset((void *) lp, 0, sizeof(struct i596_private)); |
