diff options
author | Wolfgang Denk <wd@denx.de> | 2010-09-21 09:22:17 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-09-21 09:22:17 +0200 |
commit | b65e86d8d832146600a28cb4f14f771533df4f35 (patch) | |
tree | ed366e19f82547066cf5e40f6eaac75068da623b /drivers/mtd/cfi_mtd.c | |
parent | 69434e4c9485b442f441406c37030e8a85a42cfd (diff) | |
parent | 3c29975e94eb050fdea1c4299c24f348e50b22a3 (diff) | |
download | u-boot-imx-b65e86d8d832146600a28cb4f14f771533df4f35.zip u-boot-imx-b65e86d8d832146600a28cb4f14f771533df4f35.tar.gz u-boot-imx-b65e86d8d832146600a28cb4f14f771533df4f35.tar.bz2 |
Merge branch 'next' of ../custodians into next
Diffstat (limited to 'drivers/mtd/cfi_mtd.c')
-rw-r--r-- | drivers/mtd/cfi_mtd.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/mtd/cfi_mtd.c b/drivers/mtd/cfi_mtd.c index 6a0cab3..cbcc165 100644 --- a/drivers/mtd/cfi_mtd.c +++ b/drivers/mtd/cfi_mtd.c @@ -30,15 +30,7 @@ #include <asm/errno.h> #include <linux/mtd/mtd.h> #include <linux/mtd/concat.h> - -/* use CONFIG_SYS_MAX_FLASH_BANKS_DETECT if defined */ -#ifdef CONFIG_SYS_MAX_FLASH_BANKS_DETECT -# define CFI_MAX_FLASH_BANKS CONFIG_SYS_MAX_FLASH_BANKS_DETECT -#else -# define CFI_MAX_FLASH_BANKS CONFIG_SYS_MAX_FLASH_BANKS -#endif - -extern flash_info_t flash_info[]; +#include <mtd/cfi_flash.h> static struct mtd_info cfi_mtd_info[CFI_MAX_FLASH_BANKS]; static char cfi_mtd_names[CFI_MAX_FLASH_BANKS][16]; |