diff options
Diffstat (limited to 'include/linux/mtd/nand.h')
| -rw-r--r-- | include/linux/mtd/nand.h | 10 | 
1 files changed, 3 insertions, 7 deletions
| diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index 1cdc7ae27..527d9ae03 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -18,13 +18,6 @@  #ifndef __LINUX_MTD_NAND_H  #define __LINUX_MTD_NAND_H -/* XXX U-BOOT XXX */ -#if 0 -#include <linux/wait.h> -#include <linux/spinlock.h> -#include <linux/mtd/mtd.h> -#endif -  #include "config.h"  #include "linux/mtd/compat.h" @@ -132,6 +125,7 @@ typedef enum {  	NAND_ECC_HW,  	NAND_ECC_HW_SYNDROME,  	NAND_ECC_HW_OOB_FIRST, +	NAND_ECC_SOFT_BCH,  } nand_ecc_modes_t;  /* @@ -308,6 +302,7 @@ struct nand_hw_control {   * @prepad:	padding information for syndrome based ecc generators   * @postpad:	padding information for syndrome based ecc generators   * @layout:	ECC layout control struct pointer + * @priv:       pointer to private ecc control data   * @hwctl:	function to control hardware ecc generator. Must only   *		be provided if an hardware ECC is available   * @calculate:	function for ecc calculation or readback from ecc hardware @@ -328,6 +323,7 @@ struct nand_ecc_ctrl {  	int			prepad;  	int			postpad;  	struct nand_ecclayout	*layout; +	void			*priv;  	void			(*hwctl)(struct mtd_info *mtd, int mode);  	int			(*calculate)(struct mtd_info *mtd,  					     const uint8_t *dat, |