| commit | 6977d35890ff3d04e081114da295cd8a9c16dbfa | [log] [tgz] |
|---|---|---|
| author | Wolfgang Denk <wd@denx.de> | Tue Apr 29 13:15:20 2008 +0200 |
| committer | Wolfgang Denk <wd@denx.de> | Tue Apr 29 13:15:20 2008 +0200 |
| tree | 650c3fc7c99609830bc42e36bd412c98c853b3ac | |
| parent | 650c869b12cd3302260f19282968c57a97639441 [diff] | |
| parent | fad3749cea3ac28ef9dafcb160d6ff4eeab3cf9c [diff] |
Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c index 69f53ea..a330438 100644 --- a/fs/jffs2/jffs2_1pass.c +++ b/fs/jffs2/jffs2_1pass.c
@@ -185,11 +185,7 @@ { struct mtdids *id = current_part->dev->id; u32 bytes_read = 0; -#if defined(CFG_NAND_LEGACY) size_t retlen; -#else - ulong retlen; -#endif int cpy_bytes; while (bytes_read < size) {