summaryrefslogtreecommitdiff
path: root/fs/jffs2/jffs2_1pass.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-06-03 00:16:48 +0200
committerWolfgang Denk <wd@denx.de>2008-06-03 00:16:48 +0200
commit7feb4d38ff1fdf8877f39447001ff9f6e93fa6bc (patch)
tree5ba2f3b891a37f5e9beef2710ef2f82bdbf5f0e4 /fs/jffs2/jffs2_1pass.c
parente3d0d4ac0ec900543bdda141f9ada9bf6c47d011 (diff)
parentd6ac2ed893c2168738aee01579d6283af8d37045 (diff)
downloadu-boot-imx-7feb4d38ff1fdf8877f39447001ff9f6e93fa6bc.zip
u-boot-imx-7feb4d38ff1fdf8877f39447001ff9f6e93fa6bc.tar.gz
u-boot-imx-7feb4d38ff1fdf8877f39447001ff9f6e93fa6bc.tar.bz2
Merge remote branch 'u-boot-nand-flash/master'
Diffstat (limited to 'fs/jffs2/jffs2_1pass.c')
-rw-r--r--fs/jffs2/jffs2_1pass.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c
index 1993dc2..7e27ee1 100644
--- a/fs/jffs2/jffs2_1pass.c
+++ b/fs/jffs2/jffs2_1pass.c
@@ -164,9 +164,6 @@ static struct part_info *current_part;
/* this one defined in nand_legacy.c */
int read_jffs2_nand(size_t start, size_t len,
size_t * retlen, u_char * buf, int nanddev);
-#else
-/* info for NAND chips, defined in drivers/mtd/nand/nand.c */
-extern nand_info_t nand_info[];
#endif
#define NAND_PAGE_SIZE 512