diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-02-02 19:29:59 +0100 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-02-02 19:29:59 +0100 |
commit | e5f5c4a977c411c0cd3899a4f9487eea77a0e150 (patch) | |
tree | 391225b279509f4403eb6d5e973f0b25e789a8af /include/configs/sc_sps_1.h | |
parent | 7cb70a34b976e68f6348ea0718780e8f38901482 (diff) | |
parent | 81ca840976e8e418ae8decaf03ea01f59b1b5be2 (diff) | |
download | u-boot-imx-e5f5c4a977c411c0cd3899a4f9487eea77a0e150.zip u-boot-imx-e5f5c4a977c411c0cd3899a4f9487eea77a0e150.tar.gz u-boot-imx-e5f5c4a977c411c0cd3899a4f9487eea77a0e150.tar.bz2 |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/sc_sps_1.h')
-rw-r--r-- | include/configs/sc_sps_1.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/sc_sps_1.h b/include/configs/sc_sps_1.h index cb99d58..21c76b52 100644 --- a/include/configs/sc_sps_1.h +++ b/include/configs/sc_sps_1.h @@ -158,7 +158,6 @@ #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 |