summaryrefslogtreecommitdiff
path: root/drivers/mtd/cfi_mtd.c
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2010-08-31 10:04:11 +0200
committerStefan Roese <sr@denx.de>2010-09-20 15:09:00 +0200
commit3c29975e94eb050fdea1c4299c24f348e50b22a3 (patch)
tree8b74cce0e08aa3ea7a893a0736267f8fca1b9871 /drivers/mtd/cfi_mtd.c
parentca5def3f30860a97cc76453eb846fffbde997035 (diff)
downloadu-boot-imx-3c29975e94eb050fdea1c4299c24f348e50b22a3.zip
u-boot-imx-3c29975e94eb050fdea1c4299c24f348e50b22a3.tar.gz
u-boot-imx-3c29975e94eb050fdea1c4299c24f348e50b22a3.tar.bz2
cfi_flash: Remove uneccessary #ifdef CONFIG_SYS_MAX_FLASH_BANKS_DETECT
Now that the defines are moved to header files we don't need this conditional compilation any more. Remove it. Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'drivers/mtd/cfi_mtd.c')
-rw-r--r--drivers/mtd/cfi_mtd.c10
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];