diff --git a/[refs] b/[refs]
index 778ea7cfb734..a644eb7b02e7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c21ab67b7d3c9a1296019939e0efb69350487cf
+refs/heads/master: 37e5ffa3f15bd9a8b133ab13e9bef833b5eb33d4
diff --git a/trunk/drivers/mtd/nand/s3c2410.c b/trunk/drivers/mtd/nand/s3c2410.c
index ccacc40e64ee..b34a460ab679 100644
--- a/trunk/drivers/mtd/nand/s3c2410.c
+++ b/trunk/drivers/mtd/nand/s3c2410.c
@@ -675,6 +675,9 @@ static void s3c2410_nand_init_chip(struct s3c2410_nand_info *info,
 
 	if (set->ecc_layout != NULL)
 		chip->ecc.layout = set->ecc_layout;
+
+	if (set->disable_ecc)
+		chip->ecc.mode	= NAND_ECC_NONE;
 }
 
 /* s3c2410_nand_update_chip
diff --git a/trunk/include/asm-arm/plat-s3c/nand.h b/trunk/include/asm-arm/plat-s3c/nand.h
index 01d175b54bce..ad6bbe90616e 100644
--- a/trunk/include/asm-arm/plat-s3c/nand.h
+++ b/trunk/include/asm-arm/plat-s3c/nand.h
@@ -22,6 +22,8 @@
 */
 
 struct s3c2410_nand_set {
+	unsigned int		disable_ecc : 1;
+
 	int			nr_chips;
 	int			nr_partitions;
 	char			*name;