diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2015-04-10 14:22:23 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2015-04-10 14:22:23 +0200 |
| commit | b491d9757d14415edcb1468ed896a704d0f0cfe7 (patch) | |
| tree | 477707170048989accc9ea69cd6ac5edae7b1aec /include/linux | |
| parent | 79d75d752717fb4106ec49abaddbd7744c775a35 (diff) | |
| parent | 385a08a60f042061b004642d6b9bb6cfb794ad5a (diff) | |
Merge branch 'u-boot/master'
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mtd/nand.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index 8438490fe4..bc927ecc59 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -678,11 +678,6 @@ struct nand_chip { void (*write_byte)(struct mtd_info *mtd, uint8_t byte); void (*write_buf)(struct mtd_info *mtd, const uint8_t *buf, int len); void (*read_buf)(struct mtd_info *mtd, uint8_t *buf, int len); -#ifdef __UBOOT__ -#if defined(CONFIG_MTD_NAND_VERIFY_WRITE) - int (*verify_buf)(struct mtd_info *mtd, const uint8_t *buf, int len); -#endif -#endif void (*select_chip)(struct mtd_info *mtd, int chip); int (*block_bad)(struct mtd_info *mtd, loff_t ofs, int getchip); int (*block_markbad)(struct mtd_info *mtd, loff_t ofs); |