diff options
| author | Stefan Roese <sr@denx.de> | 2007-01-13 08:01:31 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-01-13 08:01:31 +0100 |
| commit | 44cd6de2e1b0cdff76bf8c85a1c93c6844da62fd (patch) | |
| tree | 9eee07aed4b22b114a2527ab24594df4b1e3d451 /board/tqm5200 | |
| parent | 95981778cff0038fd9941044d6a3eda810e33258 (diff) | |
| parent | 6abaee42621c07e81a2cd189ad4368b5e8c50280 (diff) | |
| download | blackbird-obmc-uboot-44cd6de2e1b0cdff76bf8c85a1c93c6844da62fd.tar.gz blackbird-obmc-uboot-44cd6de2e1b0cdff76bf8c85a1c93c6844da62fd.zip | |
Merge with git+ssh://sr@pollux.denx.org/home/sr/git/u-boot/denx-merge-sr
Diffstat (limited to 'board/tqm5200')
| -rw-r--r-- | board/tqm5200/cam5200_flash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/tqm5200/cam5200_flash.c b/board/tqm5200/cam5200_flash.c index 8c3f62e398..b3f095d807 100644 --- a/board/tqm5200/cam5200_flash.c +++ b/board/tqm5200/cam5200_flash.c @@ -25,7 +25,7 @@ #include <mpc5xxx.h> #include <asm/processor.h> -#ifdef CONFIG_CAM5200 +#if defined(CONFIG_CAM5200) && defined(CONFIG_CAM5200_NIOSFLASH) #if 0 #define DEBUGF(x...) printf(x) @@ -783,4 +783,4 @@ unsigned long flash_init(void) return total_b; } -#endif /* ifdef CONFIG_CAM5200 */ +#endif /* if defined(CONFIG_CAM5200) && defined(CONFIG_CAM5200_NIOSFLASH) */ |
