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 /cpu/ppc4xx/speed.c | |
parent | c19c3134799585c9feaad63a420fe6e704f2f2a4 (diff) | |
parent | 846b0dd2dca945c8bede8a34e2fa86e876715a06 (diff) |
Merge with /home/wd/git/u-boot/master
Diffstat (limited to 'cpu/ppc4xx/speed.c')
-rw-r--r-- | cpu/ppc4xx/speed.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpu/ppc4xx/speed.c b/cpu/ppc4xx/speed.c index 7a4af75efe..469f97d6f0 100644 --- a/cpu/ppc4xx/speed.c +++ b/cpu/ppc4xx/speed.c @@ -195,7 +195,7 @@ ulong get_PCI_freq (void) #elif defined(CONFIG_440) -#if defined(CONFIG_440_EP) || defined(CONFIG_440_GR) +#if defined(CONFIG_440EP) || defined(CONFIG_440GR) void get_sys_info (sys_info_t *sysInfo) { unsigned long temp; @@ -283,7 +283,7 @@ ulong get_PCI_freq (void) return sys_info.freqPCI; } -#elif !defined(CONFIG_440_GX) +#elif !defined(CONFIG_440GX) void get_sys_info (sys_info_t * sysInfo) { unsigned long strp0; |