summaryrefslogtreecommitdiff
path: root/arch/um
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2008-12-04 13:03:12 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2008-12-04 13:06:46 +1100
commitcf76a3a7b8292423b127f6c0ecbacac8e65d40ad (patch)
tree8fc46b6d104d5fdc68f5bbf7e380243c6fb5cc19 /arch/um
parenteabeb7dac4934602a90b14649c07c13eb7e43d90 (diff)
parent3f8c6c9c7739d18e4b75902fdcbf6c3ba98dc123 (diff)
Merge commit 'net/master'
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/drivers/net_kern.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index 5b4ca8d93682..74f1a1787026 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -418,12 +418,7 @@ static void eth_configure(int n, void *init, char *mac,
setup_etheraddr(mac, device->mac, dev->name);
- printk(KERN_INFO "Netdevice %d ", n);
- printk("(%02x:%02x:%02x:%02x:%02x:%02x) ",
- device->mac[0], device->mac[1],
- device->mac[2], device->mac[3],
- device->mac[4], device->mac[5]);
- printk(": ");
+ printk(KERN_INFO "Netdevice %d (%pM) : ", n, device->mac);
lp = dev->priv;
/* This points to the transport private data. It's still clear, but we