diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-ixp4xx/fsg-setup.c | 9 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/nas100d-setup.c | 5 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/nslu2-setup.c | 5 |
3 files changed, 8 insertions, 11 deletions
diff --git a/arch/arm/mach-ixp4xx/fsg-setup.c b/arch/arm/mach-ixp4xx/fsg-setup.c index e7c6386782ed..5add22fc9899 100644 --- a/arch/arm/mach-ixp4xx/fsg-setup.c +++ b/arch/arm/mach-ixp4xx/fsg-setup.c | |||
@@ -177,7 +177,6 @@ static irqreturn_t fsg_reset_handler(int irq, void *dev_id) | |||
177 | 177 | ||
178 | static void __init fsg_init(void) | 178 | static void __init fsg_init(void) |
179 | { | 179 | { |
180 | DECLARE_MAC_BUF(mac_buf); | ||
181 | uint8_t __iomem *f; | 180 | uint8_t __iomem *f; |
182 | 181 | ||
183 | ixp4xx_sys_init(); | 182 | ixp4xx_sys_init(); |
@@ -256,10 +255,10 @@ static void __init fsg_init(void) | |||
256 | #endif | 255 | #endif |
257 | iounmap(f); | 256 | iounmap(f); |
258 | } | 257 | } |
259 | printk(KERN_INFO "FSG: Using MAC address %s for port 0\n", | 258 | printk(KERN_INFO "FSG: Using MAC address %pM for port 0\n", |
260 | print_mac(mac_buf, fsg_plat_eth[0].hwaddr)); | 259 | fsg_plat_eth[0].hwaddr); |
261 | printk(KERN_INFO "FSG: Using MAC address %s for port 1\n", | 260 | printk(KERN_INFO "FSG: Using MAC address %pM for port 1\n", |
262 | print_mac(mac_buf, fsg_plat_eth[1].hwaddr)); | 261 | fsg_plat_eth[1].hwaddr); |
263 | 262 | ||
264 | } | 263 | } |
265 | 264 | ||
diff --git a/arch/arm/mach-ixp4xx/nas100d-setup.c b/arch/arm/mach-ixp4xx/nas100d-setup.c index 0acd95ecf27e..921c947b5b6b 100644 --- a/arch/arm/mach-ixp4xx/nas100d-setup.c +++ b/arch/arm/mach-ixp4xx/nas100d-setup.c | |||
@@ -231,7 +231,6 @@ static irqreturn_t nas100d_reset_handler(int irq, void *dev_id) | |||
231 | 231 | ||
232 | static void __init nas100d_init(void) | 232 | static void __init nas100d_init(void) |
233 | { | 233 | { |
234 | DECLARE_MAC_BUF(mac_buf); | ||
235 | uint8_t __iomem *f; | 234 | uint8_t __iomem *f; |
236 | int i; | 235 | int i; |
237 | 236 | ||
@@ -294,8 +293,8 @@ static void __init nas100d_init(void) | |||
294 | #endif | 293 | #endif |
295 | iounmap(f); | 294 | iounmap(f); |
296 | } | 295 | } |
297 | printk(KERN_INFO "NAS100D: Using MAC address %s for port 0\n", | 296 | printk(KERN_INFO "NAS100D: Using MAC address %pM for port 0\n", |
298 | print_mac(mac_buf, nas100d_plat_eth[0].hwaddr)); | 297 | nas100d_plat_eth[0].hwaddr); |
299 | 298 | ||
300 | } | 299 | } |
301 | 300 | ||
diff --git a/arch/arm/mach-ixp4xx/nslu2-setup.c b/arch/arm/mach-ixp4xx/nslu2-setup.c index bc9d920ae54f..ff6a08d02cc4 100644 --- a/arch/arm/mach-ixp4xx/nslu2-setup.c +++ b/arch/arm/mach-ixp4xx/nslu2-setup.c | |||
@@ -220,7 +220,6 @@ static struct sys_timer nslu2_timer = { | |||
220 | 220 | ||
221 | static void __init nslu2_init(void) | 221 | static void __init nslu2_init(void) |
222 | { | 222 | { |
223 | DECLARE_MAC_BUF(mac_buf); | ||
224 | uint8_t __iomem *f; | 223 | uint8_t __iomem *f; |
225 | int i; | 224 | int i; |
226 | 225 | ||
@@ -275,8 +274,8 @@ static void __init nslu2_init(void) | |||
275 | #endif | 274 | #endif |
276 | iounmap(f); | 275 | iounmap(f); |
277 | } | 276 | } |
278 | printk(KERN_INFO "NSLU2: Using MAC address %s for port 0\n", | 277 | printk(KERN_INFO "NSLU2: Using MAC address %pM for port 0\n", |
279 | print_mac(mac_buf, nslu2_plat_eth[0].hwaddr)); | 278 | nslu2_plat_eth[0].hwaddr); |
280 | 279 | ||
281 | } | 280 | } |
282 | 281 | ||