summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorKristoffer Nyborg Gregertsen <kngregertsen@norway.atmel.com>2007-07-06 14:37:30 +0200
committerHaavard Skinnemoen <hskinnemoen@atmel.com>2007-07-18 20:45:52 +0200
commitd4003ba0a11f9fb484bd45fd83b75f7108871ef2 (patch)
tree3daea9e3f7182ae1749b6acb546905663da384da /arch
parent95a42267cd933a95275c1d6835010d662259f74e (diff)
downloadlinux-3.10-d4003ba0a11f9fb484bd45fd83b75f7108871ef2.tar.gz
linux-3.10-d4003ba0a11f9fb484bd45fd83b75f7108871ef2.tar.bz2
linux-3.10-d4003ba0a11f9fb484bd45fd83b75f7108871ef2.zip
[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>
Diffstat (limited to 'arch')
-rw-r--r--arch/avr32/boards/atstk1000/atstk1002.c3
1 files changed, 2 insertions, 1 deletions
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