diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-12-01 16:18:56 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-12-01 16:18:56 -0500 |
| commit | c99da91e7a12724127475a85cc7a38214b3504e2 (patch) | |
| tree | de0eb3fe32ce58804457963fd133a53bb8fba5b8 /drivers/net/bfin_mac.c | |
| parent | a31e23e15cbb9734c5883a4a7f58d8712d303e0b (diff) | |
| parent | 92d499d991ec4f5cbd00d6f33967eab9d3ee8d6c (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/net/bfin_mac.c')
| -rw-r--r-- | drivers/net/bfin_mac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c index f0f85169389..eb971755a3f 100644 --- a/drivers/net/bfin_mac.c +++ b/drivers/net/bfin_mac.c | |||
| @@ -924,7 +924,7 @@ static int __init bf537mac_probe(struct net_device *dev) | |||
| 924 | if (!is_valid_ether_addr(dev->dev_addr)) { | 924 | if (!is_valid_ether_addr(dev->dev_addr)) { |
| 925 | /* Grab the MAC from the board somehow - this is done in the | 925 | /* Grab the MAC from the board somehow - this is done in the |
| 926 | arch/blackfin/mach-bf537/boards/eth_mac.c */ | 926 | arch/blackfin/mach-bf537/boards/eth_mac.c */ |
| 927 | get_bf537_ether_addr(dev->dev_addr); | 927 | bfin_get_ether_addr(dev->dev_addr); |
| 928 | } | 928 | } |
| 929 | 929 | ||
| 930 | /* If still not valid, get a random one */ | 930 | /* If still not valid, get a random one */ |