diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2007-01-13 11:17:35 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-01-13 11:17:35 +0100 |
| commit | c6676c73dcb63d2b65262064e22fbe238336a97c (patch) | |
| tree | edc8798da8b1d1227b0ad8231bff7d904ae00526 /board/tqm5200/cam5200_flash.c | |
| parent | 0bba5452835f19a61204edcda3a58112fd8e2208 (diff) | |
| parent | 6abaee42621c07e81a2cd189ad4368b5e8c50280 (diff) | |
Merge with /home/git/u-boot
Diffstat (limited to 'board/tqm5200/cam5200_flash.c')
| -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) */ |