diff options
author | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2007-08-13 14:34:33 (GMT) |
---|---|---|
committer | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2007-08-13 14:34:33 (GMT) |
commit | 375c2c9e57ea5b8d678475379378f4774aa9cb88 (patch) | |
tree | c8499eaec089c8fe7c9eda562131f45b4a7738c6 /cpu/mpc8260/ether_scc.c | |
parent | f0d1246ed7cb5a88522244c596d7ae7e6f161283 (diff) | |
parent | 9986bc3e40e899bea372a99a2bca4071bdf2e24b (diff) | |
download | u-boot-375c2c9e57ea5b8d678475379378f4774aa9cb88.tar.xz |
Merge commit 'upstream/master'
Diffstat (limited to 'cpu/mpc8260/ether_scc.c')
-rw-r--r-- | cpu/mpc8260/ether_scc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpu/mpc8260/ether_scc.c b/cpu/mpc8260/ether_scc.c index a733b45..e56839d 100644 --- a/cpu/mpc8260/ether_scc.c +++ b/cpu/mpc8260/ether_scc.c @@ -36,7 +36,7 @@ #include <command.h> #include <config.h> -#if defined(CONFIG_ETHER_ON_SCC) && (CONFIG_COMMANDS & CFG_CMD_NET) +#if defined(CONFIG_ETHER_ON_SCC) && defined(CONFIG_CMD_NET) #if (CONFIG_ETHER_INDEX == 1) # define PROFF_ENET PROFF_SCC1 @@ -353,4 +353,4 @@ void restart(void) } #endif -#endif /* CONFIG_ETHER_ON_SCC && CFG_CMD_NET */ +#endif |