Merge 'next' branch

[u-boot] / board / esd / canbt / flash.c

diff --git a/board/esd/canbt/flash.c b/board/esd/canbt/flash.c
index de847f9beac33ba27fe583b12ef0d170a6770617..56c822ec97f981a36bef309988f5b4b43ae7c182 100644 (file)
--- a/board/esd/canbt/flash.c
+++ b/board/esd/canbt/flash.c
@@ -47,7 +47,7 @@ unsigned long flash_init (void)
        unsigned long base_b0;
 
        /* Init: no FLASHes known */
-       for (i=0; i<CFG_MAX_FLASH_BANKS; ++i) {
+       for (i=0; i<CONFIG_SYS_MAX_FLASH_BANKS; ++i) {
                flash_info[i].flash_id = FLASH_UNKNOWN;
        }