summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorDetlev Zundel <dzu@denx.de>2007-01-10 16:36:51 +0100
committerDetlev Zundel <dzu@denx.de>2007-01-10 16:36:51 +0100
commit0350e79d2a2a07444605e5ab820e10b7eb76e5d6 (patch)
tree36cd753c2528665129a418b97e3a506f7fa6e606 /board
parentbab5a90d4ccc1a46a8127b867fa59028cc623ad9 (diff)
parentd9384de2f571046e71081bae22b49e3d5ca2e3d5 (diff)
downloadu-boot-imx-0350e79d2a2a07444605e5ab820e10b7eb76e5d6.zip
u-boot-imx-0350e79d2a2a07444605e5ab820e10b7eb76e5d6.tar.gz
u-boot-imx-0350e79d2a2a07444605e5ab820e10b7eb76e5d6.tar.bz2
Merge with /home/m8/git/u-boot/
Diffstat (limited to 'board')
-rw-r--r--board/tqm5200/cam5200_flash.c4
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) */