diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-28 23:19:47 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-28 23:19:47 -0500 |
| commit | e3c6d4ee545e427b55882d97d3b663c6411645fe (patch) | |
| tree | 294326663fb757739a98083c2ddd570d1eaf7337 /arch/sparc/kernel | |
| parent | 5bc053089376217943187ed5153d0d1e5c5085b6 (diff) | |
| parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/sparc64/kernel/idprom.c
Diffstat (limited to 'arch/sparc/kernel')
| -rw-r--r-- | arch/sparc/kernel/idprom.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/sparc/kernel/idprom.c b/arch/sparc/kernel/idprom.c index 1b0bd9120c1c..c16135e0c151 100644 --- a/arch/sparc/kernel/idprom.c +++ b/arch/sparc/kernel/idprom.c | |||
| @@ -95,8 +95,5 @@ void __init idprom_init(void) | |||
| 95 | 95 | ||
| 96 | display_system_type(idprom->id_machtype); | 96 | display_system_type(idprom->id_machtype); |
| 97 | 97 | ||
| 98 | printk(KERN_WARNING "Ethernet address: %02x:%02x:%02x:%02x:%02x:%02x\n", | 98 | printk(KERN_WARNING "Ethernet address: %pM\n", idprom->id_ethaddr); |
| 99 | idprom->id_ethaddr[0], idprom->id_ethaddr[1], | ||
| 100 | idprom->id_ethaddr[2], idprom->id_ethaddr[3], | ||
| 101 | idprom->id_ethaddr[4], idprom->id_ethaddr[5]); | ||
| 102 | } | 99 | } |