From 2921b9e73d316d585c09bd6b81d7c587301ffee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lothar=20Wa=C3=9Fmann?= Date: Wed, 7 Dec 2011 21:59:29 +0000 Subject: [PATCH] --- yaml --- r: 278522 b: refs/heads/master c: 589efdc7f7327bc8ddf597bdaf9de38fcea31744 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/freescale/fec.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 89b4e6878b26..2ac9fc46604a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 86f9f2c81c44223b1be129d0b15cf6edac2a5278 +refs/heads/master: 589efdc7f7327bc8ddf597bdaf9de38fcea31744 diff --git a/trunk/drivers/net/ethernet/freescale/fec.c b/trunk/drivers/net/ethernet/freescale/fec.c index e2b5ce6efa20..11534b9c6b39 100644 --- a/trunk/drivers/net/ethernet/freescale/fec.c +++ b/trunk/drivers/net/ethernet/freescale/fec.c @@ -818,7 +818,7 @@ static void __inline__ fec_get_mac(struct net_device *ndev) iap = (unsigned char *)FEC_FLASHMAC; #else if (pdata) - memcpy(iap, pdata->mac, ETH_ALEN); + iap = (unsigned char *)&pdata->mac; #endif }