diff options
author | Wolfgang Denk <wd@denx.de> | 2009-07-08 22:01:54 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-07-08 22:01:54 +0200 |
commit | a350d0d37d7c113afbd9b0d2cf60ac542007f9e6 (patch) | |
tree | 67f27eba89982fe1e67b0663b19ad44e02d4fcb6 /cpu/ppc4xx/cpu.c | |
parent | 23bca26ab0d09c043bfcada881e423a28cb6b574 (diff) | |
parent | d073aeea4f46c2d2842010edba8e8a6ed92dbe1b (diff) |
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'cpu/ppc4xx/cpu.c')
-rw-r--r-- | cpu/ppc4xx/cpu.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cpu/ppc4xx/cpu.c b/cpu/ppc4xx/cpu.c index 06f44ad376..fb3837c3df 100644 --- a/cpu/ppc4xx/cpu.c +++ b/cpu/ppc4xx/cpu.c @@ -54,6 +54,7 @@ int __get_cpu_num(void) } int get_cpu_num(void) __attribute__((weak, alias("__get_cpu_num"))); +#if defined(CONFIG_PCI) #if defined(CONFIG_405GP) || \ defined(CONFIG_440EP) || defined(CONFIG_440GR) || \ defined(CONFIG_440EPX) || defined(CONFIG_440GRX) @@ -76,6 +77,7 @@ static int pci_async_enabled(void) #endif } #endif +#endif /* CONFIG_PCI */ #if defined(CONFIG_PCI) && !defined(CONFIG_IOP480) && \ !defined(CONFIG_405) && !defined(CONFIG_405EX) |