lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Browse Source 
Conflicts:
	arch/sparc64/kernel/idprom.c
This commit is contained in:
David S. Miller
2008-12-28 20:19:47 -08:00
parent 5bc0530893 3c92ec8ae9
commit e3c6d4ee54
3086 changed files with 148899 additions and 84572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/sparc/kernel/idprom.c
View File

@@ -95,8 +95,5 @@ void __init idprom_init(void)
display_system_type(idprom->id_machtype);
printk(KERN_WARNING "Ethernet address: %02x:%02x:%02x:%02x:%02x:%02x\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(KERN_WARNING "Ethernet address: %pM\n", idprom->id_ethaddr);
}