summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2005-10-15 18:23:43 +0200
committerWolfgang Denk <wd@pollux.denx.de>2005-10-15 18:23:43 +0200
commit84bd92bdda05e6aaae3150ed6ef957b3a67398b7 (patch)
treeea5e3abbeff7e3f8412a2e34645b9773f50578e8 /fs
parent77ddac9480d63a80b6bb76d7ee4dcc2d1070867e (diff)
parent36247821ef77cc13d5f9fdbf7771564f9f8386bd (diff)
downloadu-boot-imx-84bd92bdda05e6aaae3150ed6ef957b3a67398b7.zip
u-boot-imx-84bd92bdda05e6aaae3150ed6ef957b3a67398b7.tar.gz
u-boot-imx-84bd92bdda05e6aaae3150ed6ef957b3a67398b7.tar.bz2
Merge with /home/m8/git/u-boot
Diffstat (limited to 'fs')
-rw-r--r--fs/cramfs/cramfs.c2
-rw-r--r--fs/jffs2/jffs2_1pass.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/cramfs/cramfs.c b/fs/cramfs/cramfs.c
index f02bf3c..48e7f63 100644
--- a/fs/cramfs/cramfs.c
+++ b/fs/cramfs/cramfs.c
@@ -44,7 +44,7 @@ struct cramfs_super super;
/* CPU address space offset calculation macro, struct part_info offset is
* device address space offset, so we need to shift it by a device start address. */
-extern flash_info_t flash_info[CFG_MAX_FLASH_BANKS];
+extern flash_info_t flash_info[];
#define PART_OFFSET(x) (x->offset + flash_info[x->dev->id->num].start[0])
static int cramfs_read_super (struct part_info *info)
diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c
index b621e6a..c6c0c2a 100644
--- a/fs/jffs2/jffs2_1pass.c
+++ b/fs/jffs2/jffs2_1pass.c
@@ -263,7 +263,7 @@ static inline void *get_fl_mem_nor(u32 off)
u32 addr = off;
struct mtdids *id = current_part->dev->id;
- extern flash_info_t flash_info[CFG_MAX_FLASH_BANKS];
+ extern flash_info_t flash_info[];
flash_info_t *flash = &flash_info[id->num];
addr += flash->start[0];