diff options
author | Wolfgang Denk <wd@denx.de> | 2011-10-04 22:20:25 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2011-10-04 22:20:25 +0200 |
commit | 4f7549d2dc00023c5f33d1adc7fee0a77575fcb2 (patch) | |
tree | f87d6f02fe74f832d18ab8c11feb0978da53014a /include | |
parent | 1fed668b3fb9c35932f58af00ff5539239fa4e1d (diff) | |
parent | 169de9059f24f50c4c7ac794ded060b2c133a29c (diff) | |
download | u-boot-imx-4f7549d2dc00023c5f33d1adc7fee0a77575fcb2.zip u-boot-imx-4f7549d2dc00023c5f33d1adc7fee0a77575fcb2.tar.gz u-boot-imx-4f7549d2dc00023c5f33d1adc7fee0a77575fcb2.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
* 'master' of git://git.denx.de/u-boot-nand-flash:
PPC: Fix socrates NAND problem
PPC: Fix fsl_upm.c by renaming nand handling functions
NAND: Make page, erase, oob size available via cmd_nand
mtd: eLBC NAND: remove elbc_fcm_ctrl->oob_poi
NAND: Add -y option to nand scrub command
NAND: Add nand read.raw and write.raw commands
NAND: Really ignore bad blocks when scrubbing
spl, nand: add 4bit HW ecc oob first nand_read_page function
mxc_nand: fix a problem writing more than 32MB
mxc_nand: fixed some typos (cosmetic)
nand: increase chip_delay in mv kirkwood nand driver
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/mtd/mtd.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index d36d584..141c960 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -55,6 +55,7 @@ struct erase_info { u_long priv; u_char state; struct erase_info *next; + int scrub; }; struct mtd_erase_region_info { |