diff options
| author | Detlev Zundel <dzu@denx.de> | 2007-01-10 16:36:51 +0100 |
|---|---|---|
| committer | Detlev Zundel <dzu@denx.de> | 2007-01-10 16:36:51 +0100 |
| commit | 0350e79d2a2a07444605e5ab820e10b7eb76e5d6 (patch) | |
| tree | 36cd753c2528665129a418b97e3a506f7fa6e606 /board | |
| parent | bab5a90d4ccc1a46a8127b867fa59028cc623ad9 (diff) | |
| parent | d9384de2f571046e71081bae22b49e3d5ca2e3d5 (diff) | |
Merge with /home/m8/git/u-boot/
Diffstat (limited to 'board')
| -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 8c3f62e398c..b3f095d807f 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) */ |