Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[linux-2.6-omap-h63xx.git] / include / asm-arm / plat-s3c / nand.h

diff --git a/include/asm-arm/plat-s3c/nand.h b/include/asm-arm/plat-s3c/nand.h
index 8816f7f9cee15add2e5614d281db721c374c0392..ad6bbe90616e2e026810deabffe71f90fafd2ab5 100644 (file)
--- a/include/asm-arm/plat-s3c/nand.h
+++ b/include/asm-arm/plat-s3c/nand.h
@@ -22,11 +22,14 @@
 */
 
 struct s3c2410_nand_set {
+       unsigned int            disable_ecc : 1;
+
        int                     nr_chips;
        int                     nr_partitions;
        char                    *name;
        int                     *nr_map;
        struct mtd_partition    *partitions;
+       struct nand_ecclayout   *ecc_layout;
 };
 
 struct s3c2410_platform_nand {
@@ -36,6 +39,8 @@ struct s3c2410_platform_nand {
        int     twrph0; /* active time for nWE/nOE */
        int     twrph1; /* time for release CLE/ALE from nWE/nOE inactive */
 
+       unsigned int    ignore_unset_ecc : 1;
+
        int                     nr_sets;
        struct s3c2410_nand_set *sets;