From 2ac8ffc0d4bbae8004b7b5e416e4cb684800e09e Mon Sep 17 00:00:00 2001
From: Kristoffer Nyborg Gregertsen <kngregertsen@norway.atmel.com>
Date: Fri, 6 Jul 2007 14:37:30 +0200
Subject: [PATCH] --- yaml --- r: 61402 b: refs/heads/master c:
 d4003ba0a11f9fb484bd45fd83b75f7108871ef2 h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/arch/avr32/boards/atstk1000/atstk1002.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8afd0fcd8928..60b29cb81564 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 95a42267cd933a95275c1d6835010d662259f74e
+refs/heads/master: d4003ba0a11f9fb484bd45fd83b75f7108871ef2
diff --git a/trunk/arch/avr32/boards/atstk1000/atstk1002.c b/trunk/arch/avr32/boards/atstk1000/atstk1002.c
index ed283045f3bf..d88ac1110101 100644
--- a/trunk/arch/avr32/boards/atstk1000/atstk1002.c
+++ b/trunk/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