summaryrefslogtreecommitdiff
path: root/board/icecube/flash.c
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/icecube/flash.c
parent5a7ddf4e1fb9347f783eb1473c30187d7a22bd81 (diff)
parent9483df6408c25f16060432de3868901e352e23bc (diff)
downloadu-boot-imx-2fd0aad443c966ce62008225e57b18e2dcf4e330.zip
u-boot-imx-2fd0aad443c966ce62008225e57b18e2dcf4e330.tar.gz
u-boot-imx-2fd0aad443c966ce62008225e57b18e2dcf4e330.tar.bz2
Merge branch 'Makefile' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'board/icecube/flash.c')
-rw-r--r--board/icecube/flash.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/board/icecube/flash.c b/board/icecube/flash.c
index 15e86d3..2d4026a 100644
--- a/board/icecube/flash.c
+++ b/board/icecube/flash.c
@@ -23,7 +23,7 @@
#include <common.h>
-#ifndef CFG_FLASH_CFI_DRIVER
+#ifndef CONFIG_FLASH_CFI_DRIVER
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
/* NOTE - CONFIG_FLASH_16BIT means the CPU interface is 16-bit, it
@@ -490,4 +490,4 @@ static int write_word_amd (flash_info_t *info, FPWV *dest, FPW data)
return (res);
}
-#endif /*CFG_FLASH_CFI_DRIVER*/
+#endif /*CONFIG_FLASH_CFI_DRIVER*/