From e6c4bdf89856eb3bd84066de721828e5c37e8dad Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Sat, 11 Sep 2010 17:17:08 +0300 Subject: [PATCH] --- yaml --- r: 219860 b: refs/heads/master c: d225eef71c0dccdcbf31016820029d835a13b9e3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/octeon/ethernet.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 58cfc992feed..8c1cf383fb2b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 28dc55bc9a6c1ab2a80ee2daa935be4598e0a6f6 +refs/heads/master: d225eef71c0dccdcbf31016820029d835a13b9e3 diff --git a/trunk/drivers/staging/octeon/ethernet.c b/trunk/drivers/staging/octeon/ethernet.c index e50a17d80707..9537ea4ae09d 100644 --- a/trunk/drivers/staging/octeon/ethernet.c +++ b/trunk/drivers/staging/octeon/ethernet.c @@ -465,10 +465,7 @@ int cvm_oct_common_init(struct net_device *dev) if (cvm_oct_mac_addr_offset >= octeon_bootinfo->mac_addr_count) printk(KERN_DEBUG "%s: Using MAC outside of the assigned range:" - " %02x:%02x:%02x:%02x:%02x:%02x\n", dev->name, - sa.sa_data[0] & 0xff, sa.sa_data[1] & 0xff, - sa.sa_data[2] & 0xff, sa.sa_data[3] & 0xff, - sa.sa_data[4] & 0xff, sa.sa_data[5] & 0xff); + " %pM\n", dev->name, &sa.sa_data[0]); cvm_oct_mac_addr_offset++; /*