summaryrefslogtreecommitdiff
path: root/include/configs/MERGERBOX.h
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-10-02 10:01:28 (GMT)
committerWolfgang Denk <wd@denx.de>2011-10-05 20:22:16 (GMT)
commit31a4f1e5b6ee9b6335f0313dce7637cef887f84f (patch)
treee0f7944dcb5150ae64a6f30a0b1e0fdce98f6998 /include/configs/MERGERBOX.h
parente2a53458a7ab375233048e922c4adf494866a78f (diff)
downloadu-boot-31a4f1e5b6ee9b6335f0313dce7637cef887f84f.tar.xz
board configs: drop NET_MULTI references
Now that none of the core checks CONFIG_NET_MULTI, there's not much point in boards defining it. So scrub all references to it. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'include/configs/MERGERBOX.h')
-rw-r--r--include/configs/MERGERBOX.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/MERGERBOX.h b/include/configs/MERGERBOX.h
index f9681cd..da924c8 100644
--- a/include/configs/MERGERBOX.h
+++ b/include/configs/MERGERBOX.h
@@ -273,7 +273,6 @@
/*
* TSEC
*/
-#define CONFIG_NET_MULTI
#define CONFIG_GMII /* MII PHY management */
#define CONFIG_SYS_VSC8601_SKEWFIX
#define CONFIG_SYS_VSC8601_SKEW_TX 3