From: Kristoffer Nyborg Gregertsen <kngregertsen@norway.atmel.com>
Date: Fri, 6 Jul 2007 12:37:30 +0000 (+0200)
Subject: [AVR32] Don't wire up macb0 unless SW6 is in default position
X-Git-Tag: v2.6.23-rc1~489^2~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d4003ba0a11f9fb484bd45fd83b75f7108871ef2;p=linux-2.6-omap-h63xx.git

[AVR32] Don't wire up macb0 unless SW6 is in default position

If the user wants to sacrifice macb0 for more GPIOs, let him.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
---

diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c
index ed283045f3b..d88ac111010 100644
--- a/arch/avr32/boards/atstk1000/atstk1002.c
+++ b/arch/avr32/boards/atstk1000/atstk1002.c
@@ -154,8 +154,9 @@ static int __init atstk1002_init(void)
 #endif
 	at32_add_device_usart(2);
 
+#ifndef CONFIG_BOARD_ATSTK1002_SW6_CUSTOM
 	set_hw_addr(at32_add_device_eth(0, &eth_data[0]));
-
+#endif
 #ifndef CONFIG_BOARD_ATSTK1002_SW1_CUSTOM
 	at32_add_device_spi(0, spi0_board_info, ARRAY_SIZE(spi0_board_info));
 #endif