summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-09-05 12:04:49 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-09-05 12:04:49 +0200
commitf0f102fde85aca438f4322893729f28135bf3c61 (patch)
tree46fa6efb55aae1ffc38278b4cf660367d8001e7e /include
parent19d829fa60fc4e6df514a046142faaaf9fc8185d (diff)
parent27871e6b519ccd933bd91c879241995c272fef3b (diff)
downloadu-boot-imx-f0f102fde85aca438f4322893729f28135bf3c61.zip
u-boot-imx-f0f102fde85aca438f4322893729f28135bf3c61.tar.gz
u-boot-imx-f0f102fde85aca438f4322893729f28135bf3c61.tar.bz2
Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'
Diffstat (limited to 'include')
-rw-r--r--include/configs/sama5d3xek.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h
index 4099198..76fa500 100644
--- a/include/configs/sama5d3xek.h
+++ b/include/configs/sama5d3xek.h
@@ -130,7 +130,6 @@
/* Ethernet Hardware */
#define CONFIG_MACB
#define CONFIG_RMII
-#define CONFIG_NET_MULTI
#define CONFIG_NET_RETRY_COUNT 20
#define CONFIG_MACB_SEARCH_PHY
#define CONFIG_RGMII