diff options
| author | Stefan Roese <sr@denx.de> | 2007-01-13 07:18:38 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-01-13 07:18:38 +0100 |
| commit | b8b787065210a1650e16716e21b73468fdaf5ea8 (patch) | |
| tree | 06a4ebaaee38e8557f5ad37e02698934227a60fb /board/tqm5200/cam5200_flash.c | |
| parent | 7590da92b1c8bad5475e4b6cf18781248b966d9d (diff) | |
| parent | 6abaee42621c07e81a2cd189ad4368b5e8c50280 (diff) | |
| download | u-boot-imx-b8b787065210a1650e16716e21b73468fdaf5ea8.zip u-boot-imx-b8b787065210a1650e16716e21b73468fdaf5ea8.tar.gz u-boot-imx-b8b787065210a1650e16716e21b73468fdaf5ea8.tar.bz2 | |
Merge with git+ssh://sr@pollux.denx.org/home/sr/git/u-boot/denx/.git
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 8c3f62e..b3f095d 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) */ |