summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-11-03 13:01:48 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-11-03 13:01:48 -0800
commitdf91fba5e7ed414b1856b33bbed6d55439a14c47 (patch)
tree8bc38c985e2051ef792a4de4ee544044248a8080
parente8a2a176dd0f3e4c7252b79dc5cea6bd4acaf78e (diff)
parentbab84fa9cc09dfa9702029f83ea6bf8bf5ae96af (diff)
downloadblackbird-op-linux-df91fba5e7ed414b1856b33bbed6d55439a14c47.tar.gz
blackbird-op-linux-df91fba5e7ed414b1856b33bbed6d55439a14c47.zip
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k update from Geert Uytterhoeven. * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k/sun3: Use %pM format specifier to print ethernet address
-rw-r--r--arch/m68k/sun3/idprom.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/m68k/sun3/idprom.c b/arch/m68k/sun3/idprom.c
index c86ac37d1983..cfe9aa422343 100644
--- a/arch/m68k/sun3/idprom.c
+++ b/arch/m68k/sun3/idprom.c
@@ -125,8 +125,5 @@ void __init idprom_init(void)
display_system_type(idprom->id_machtype);
- printk("Ethernet address: %x:%x:%x:%x:%x:%x\n",
- idprom->id_ethaddr[0], idprom->id_ethaddr[1],
- idprom->id_ethaddr[2], idprom->id_ethaddr[3],
- idprom->id_ethaddr[4], idprom->id_ethaddr[5]);
+ printk("Ethernet address: %pM\n", idprom->id_ethaddr);
}
OpenPOWER on IntegriCloud