Commit df91fba5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents e8a2a176 bab84fa9

arch/m68k/sun3/idprom.c

+1 −4
Original line number Diff line number Diff line
@@ -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);

}