From: Tom Rini <trini@ti.com>
Date: Tue, 12 Feb 2013 15:18:31 +0000 (-0500)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-arm
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=951c6baaf44c7fd4335b75fb92840d4e42c94927;p=project%2Fbcm63xx%2Fu-boot.git

Merge branch 'master' of git://git.denx.de/u-boot-arm
---

951c6baaf44c7fd4335b75fb92840d4e42c94927
diff --cc include/configs/sc_sps_1.h
index f807a61c73,21c76b5274..decf8d9dec
--- a/include/configs/sc_sps_1.h
+++ b/include/configs/sc_sps_1.h
@@@ -158,8 -158,8 +158,7 @@@
  #ifdef CONFIG_CMD_NET
  #define CONFIG_ETHPRIME			"FEC0"
  #define CONFIG_FEC_MXC
- #define CONFIG_FEC_MXC_MULTI
  #define CONFIG_MII
 -#define CONFIG_DISCOVER_PHY
  #define CONFIG_FEC_XCV_TYPE		RMII
  #define CONFIG_PHYLIB
  #define CONFIG_PHY_SMSC