summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-01-17 09:43:40 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2011-01-17 09:43:40 +0100
commit2f0109b1bb833fe3481b37a6cfa0ae319d248754 (patch)
treea7b1d214a66fcc4f5618fc4e4fec6d23237b6b28 /net
parent2fed74ef6d446552300cc254de7b3e26140b04fe (diff)
parentd0e7facd5482c31a5640b31c9a4555e5a4ee215c (diff)
downloadbarebox-2f0109b1bb833fe3481b37a6cfa0ae319d248754.tar.gz
barebox-2f0109b1bb833fe3481b37a6cfa0ae319d248754.tar.xz
Merge branch 'master' into next
Diffstat (limited to 'net')
-rw-r--r--net/eth.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/eth.c b/net/eth.c
index 7502e98253..8333d80c8f 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -166,7 +166,7 @@ int eth_register(struct eth_device *edev)
if (edev->get_ethaddr(edev, ethaddr) == 0) {
ethaddr_to_string(ethaddr, ethaddr_str);
- printf("got MAC address from EEPROM: %s\n",&ethaddr_str);
+ printf("got MAC address from EEPROM: %s\n", ethaddr_str);
dev_set_param(dev, "ethaddr", ethaddr_str);
}