diff options
author | Tom Rini <trini@ti.com> | 2013-04-11 14:31:50 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2013-04-11 14:31:50 -0400 |
commit | 980464a4fc6d69c080ea02115f05694efe313cd8 (patch) | |
tree | 537e97f4cbe77ed65b56ffeafe1d50031c1771cb /include/nand.h | |
parent | fac150e83f403933e9ffc9d01f858c4a6313874e (diff) | |
parent | dda48e8efff878e51e986befd9c6c3780b4757a7 (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'include/nand.h')
-rw-r--r-- | include/nand.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/nand.h b/include/nand.h index dded4e27f0..f0f3bf94b5 100644 --- a/include/nand.h +++ b/include/nand.h @@ -129,7 +129,7 @@ struct nand_erase_options { typedef struct nand_erase_options nand_erase_options_t; int nand_read_skip_bad(nand_info_t *nand, loff_t offset, size_t *length, - u_char *buffer); + size_t *actual, loff_t lim, u_char *buffer); #define WITH_YAFFS_OOB (1 << 0) /* whether write with yaffs format. This flag * is a 'mode' meaning it cannot be mixed with @@ -137,7 +137,7 @@ int nand_read_skip_bad(nand_info_t *nand, loff_t offset, size_t *length, #define WITH_DROP_FFS (1 << 1) /* drop trailing all-0xff pages */ int nand_write_skip_bad(nand_info_t *nand, loff_t offset, size_t *length, - u_char *buffer, int flags); + size_t *actual, loff_t lim, u_char *buffer, int flags); int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts); int nand_torture(nand_info_t *nand, loff_t offset); |