From c7e1e1af0c7316a874f8a56b668b31ae59c5a38c Mon Sep 17 00:00:00 2001 From: Danny Kukawka Date: Fri, 24 Feb 2012 14:46:01 +0100 Subject: [PATCH] --- yaml --- r: 290467 b: refs/heads/master c: 3274ce71fede837176e59b1579ac9679dc990117 h: refs/heads/master i: 290465: 93d8427a4e16b3838d2e679a4c3e341d4c9a2b24 290463: 75135df8e94cc09f5bb2e14c8857e2f0f674ad3b v: v3 --- [refs] | 2 +- trunk/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 3b5a93368669..3b3420e29603 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff40a675bba27c990c7b32c2fcc50d3db758b226 +refs/heads/master: 3274ce71fede837176e59b1579ac9679dc990117 diff --git a/trunk/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c b/trunk/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c index 917bbb082a6e..7569aa0f24d1 100644 --- a/trunk/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c +++ b/trunk/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c @@ -2211,11 +2211,8 @@ struct net_device *init_ft1000_card(struct pcmcia_device *link, ft1000InitProc(dev); ft1000_card_present = 1; SET_ETHTOOL_OPS(dev, &ops); - printk(KERN_INFO - "ft1000: %s: addr 0x%04lx irq %d, MAC addr %02x:%02x:%02x:%02x:%02x:%02x\n", - dev->name, dev->base_addr, dev->irq, dev->dev_addr[0], - dev->dev_addr[1], dev->dev_addr[2], dev->dev_addr[3], - dev->dev_addr[4], dev->dev_addr[5]); + printk(KERN_INFO "ft1000: %s: addr 0x%04lx irq %d, MAC addr %pM\n", + dev->name, dev->base_addr, dev->irq, dev->dev_addr); return dev; err_unreg: