aboutsummaryrefslogtreecommitdiffstats
path: root/board/prodrive
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-08-13 23:23:13 +0200
committerWolfgang Denk <wd@denx.de>2008-08-13 23:23:13 +0200
commit2fd0aad443c966ce62008225e57b18e2dcf4e330 (patch)
treea9166e535df4d867ce73eca3fd97ebc500ecf771 /board/prodrive
parent5a7ddf4e1fb9347f783eb1473c30187d7a22bd81 (diff)
parent9483df6408c25f16060432de3868901e352e23bc (diff)
downloadu-boot-midas-2fd0aad443c966ce62008225e57b18e2dcf4e330.tar.gz
u-boot-midas-2fd0aad443c966ce62008225e57b18e2dcf4e330.tar.bz2
u-boot-midas-2fd0aad443c966ce62008225e57b18e2dcf4e330.zip
Merge branch 'Makefile' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'board/prodrive')
-rw-r--r--board/prodrive/pdnb3/flash.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/board/prodrive/pdnb3/flash.c b/board/prodrive/pdnb3/flash.c
index 518ea9c031..0786324fba 100644
--- a/board/prodrive/pdnb3/flash.c
+++ b/board/prodrive/pdnb3/flash.c
@@ -24,7 +24,7 @@
#include <common.h>
#include <asm/arch/ixp425.h>
-#if !defined(CFG_FLASH_CFI_DRIVER)
+#if !defined(CONFIG_FLASH_CFI_DRIVER)
/*
* include common flash code (for esd boards)
@@ -86,4 +86,4 @@ unsigned long flash_init(void)
return size;
}
-#endif /* CFG_FLASH_CFI_DRIVER */
+#endif /* CONFIG_FLASH_CFI_DRIVER */