diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 | 
|---|---|---|
| committer | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 | 
| commit | 50bd0057ba8fceeb48533f8b1a652ccd0e170838 (patch) | |
| tree | ea1a183343573c2a48248923b96d316c0956727c /board/MAI/AmigaOneG3SE/flash.c | |
| parent | 9dbc366744960013965fce8851035b6141f3b3ae (diff) | |
| parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
| download | olio-uboot-2014.01-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.xz olio-uboot-2014.01-50bd0057ba8fceeb48533f8b1a652ccd0e170838.zip | |
Merge git://git.denx.de/u-boot into x1
Conflicts:
	drivers/usb/usb_ohci.c
Diffstat (limited to 'board/MAI/AmigaOneG3SE/flash.c')
| -rw-r--r-- | board/MAI/AmigaOneG3SE/flash.c | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/board/MAI/AmigaOneG3SE/flash.c b/board/MAI/AmigaOneG3SE/flash.c index 409b955fd..a96d5bae2 100644 --- a/board/MAI/AmigaOneG3SE/flash.c +++ b/board/MAI/AmigaOneG3SE/flash.c @@ -1,14 +1,14 @@  #include <common.h>  #include <flash.h> -flash_info_t    flash_info[CFG_MAX_FLASH_BANKS]; +flash_info_t    flash_info[CONFIG_SYS_MAX_FLASH_BANKS];  unsigned long flash_init(void)  {      int i; -    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;  	flash_info[i].sector_count = 0; |