diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2005-08-09 17:38:59 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2005-08-09 17:38:59 +0200 |
| commit | 38ec37d0f1ba3cb7e7d3766d62e01ededbdcbd1d (patch) | |
| tree | df795a78bfb6b851feb172f0e0f26d9ada260b91 /include/405gp_enet.h | |
| parent | c19c3134799585c9feaad63a420fe6e704f2f2a4 (diff) | |
| parent | 846b0dd2dca945c8bede8a34e2fa86e876715a06 (diff) | |
| download | olio-uboot-2014.01-38ec37d0f1ba3cb7e7d3766d62e01ededbdcbd1d.tar.xz olio-uboot-2014.01-38ec37d0f1ba3cb7e7d3766d62e01ededbdcbd1d.zip | |
Merge with /home/wd/git/u-boot/master
Diffstat (limited to 'include/405gp_enet.h')
| -rw-r--r-- | include/405gp_enet.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/405gp_enet.h b/include/405gp_enet.h index 233ea1113..b9bdaaf7c 100644 --- a/include/405gp_enet.h +++ b/include/405gp_enet.h @@ -67,7 +67,7 @@ struct arp_entry { /*Register addresses */ #if defined(CONFIG_440) -#if defined(CONFIG_440_EP) || defined(CONFIG_440_GR) +#if defined(CONFIG_440EP) || defined(CONFIG_440GR) #define ZMII_BASE (CFG_PERIPHERAL_BASE + 0x0D00) #else #define ZMII_BASE (CFG_PERIPHERAL_BASE + 0x0780) @@ -81,7 +81,7 @@ struct arp_entry { #endif /* CONFIG_440 */ #if defined(CONFIG_440) -#if defined(CONFIG_440_EP) || defined(CONFIG_440_GR) +#if defined(CONFIG_440EP) || defined(CONFIG_440GR) #define EMAC_BASE (CFG_PERIPHERAL_BASE + 0x0E00) #else #define EMAC_BASE (CFG_PERIPHERAL_BASE + 0x0800) |