diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
| commit | f82642e33899766892499b163e60560fbbf87773 (patch) | |
| tree | ab90f076f18e56b2b3e8c9375b95917daa78c1d9 /include/galileo | |
| parent | b59b16ca24bc7e77ec113021a6d77b9b32fcf192 (diff) | |
| parent | 360fe71e82b83e264c964c9447c537e9a1f643c8 (diff) | |
Merge 'next' branch
Conflicts:
board/freescale/mpc8536ds/mpc8536ds.c
include/configs/mgcoge.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/galileo')
| -rw-r--r-- | include/galileo/core.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/galileo/core.h b/include/galileo/core.h index 49f4dd2d21..c277509298 100644 --- a/include/galileo/core.h +++ b/include/galileo/core.h @@ -23,13 +23,13 @@ extern unsigned int INTERNAL_REG_BASE_ADDR; #define GT_64260 0 /* includes both 64260A and 64260B */ #define GT_64261 1 -#if (CFG_GT_6426x == GT_64260) +#if (CONFIG_SYS_GT_6426x == GT_64260) #ifdef CONFIG_ETHER_PORT_MII #define GAL_ETH_DEVS 2 #else #define GAL_ETH_DEVS 3 #endif -#elif (CFG_GT_6426x == GT_64261) +#elif (CONFIG_SYS_GT_6426x == GT_64261) #define GAL_ETH_DEVS 2 #else #define GAL_ETH_DEVS 3 /* default to a 64260 */ |