upgrade to upstream version 2013.07

[karo-tx-uboot.git] / include / linux / mtd / nand_ecc.h

diff --git a/include/linux/mtd/nand_ecc.h b/include/linux/mtd/nand_ecc.h
index 9715a53d86d4ec3716b167a646dd3732da556d13..090da505425d77d105acb6133d63dfaaa7c95b7b 100644 (file)
--- a/include/linux/mtd/nand_ecc.h
+++ b/include/linux/mtd/nand_ecc.h
@@ -15,10 +15,6 @@
 
 struct mtd_info;
 
-#if defined(CONFIG_MTD_ECC_SOFT)
-
-static inline int mtd_nand_has_ecc_soft(void) { return 1; }
-
 /*
  * Calculate 3 byte ECC code for 256 byte block
  */
@@ -29,25 +25,4 @@ int nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code
  */
 int nand_correct_data(struct mtd_info *mtd, u_char *dat, u_char *read_ecc, u_char *calc_ecc);
 
-#else
-
-static inline int mtd_nand_has_ecc_soft(void) { return 0; }
-
-static inline int
-nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code)
-{
-       return -1;
-}
-
-static inline int
-nand_correct_data(struct mtd_info *mtd,
-                       u_char *dat,
-                       u_char *read_ecc,
-                       u_char *calc_ecc)
-{
-       return -1;
-}
-
-#endif
-
 #endif /* __MTD_NAND_ECC_H__ */