diff options
| author | Ben Warren <biggerbadderben@gmail.com> | 2008-06-08 22:04:22 -0700 |
|---|---|---|
| committer | Ben Warren <biggerbadderben@gmail.com> | 2008-06-08 22:04:22 -0700 |
| commit | e44f3ea4e801d37ef293284cb57b9637382f211a (patch) | |
| tree | 09e6e9e68764e65ef7115db18319ec7e57c90b41 /fs | |
| parent | 0e38c938ed4bcadb4f4fc1419a541431e94fc202 (diff) | |
| parent | 8155efbd7ae9c65564ca98affe94631d612ae088 (diff) | |
| download | u-boot-imx-e44f3ea4e801d37ef293284cb57b9637382f211a.zip u-boot-imx-e44f3ea4e801d37ef293284cb57b9637382f211a.tar.gz u-boot-imx-e44f3ea4e801d37ef293284cb57b9637382f211a.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/jffs2/jffs2_1pass.c | 3 |
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 |