From b78887d1e04f63a28e3ec3e89daa639e797da6c1 Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-mtd@fluff.org>
Date: Tue, 15 Apr 2008 11:36:21 +0100
Subject: [PATCH] --- yaml --- r: 93050 b: refs/heads/master c:
 1c21ab67b7d3c9a1296019939e0efb69350487cf h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/mtd/nand/s3c2410.c      | 3 +++
 trunk/include/asm-arm/plat-s3c/nand.h | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index aed519cfc510..778ea7cfb734 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c45c6c68333c04de84c21a4b869f36a96f642779
+refs/heads/master: 1c21ab67b7d3c9a1296019939e0efb69350487cf
diff --git a/trunk/drivers/mtd/nand/s3c2410.c b/trunk/drivers/mtd/nand/s3c2410.c
index 35401f7b9302..ccacc40e64ee 100644
--- a/trunk/drivers/mtd/nand/s3c2410.c
+++ b/trunk/drivers/mtd/nand/s3c2410.c
@@ -672,6 +672,9 @@ static void s3c2410_nand_init_chip(struct s3c2410_nand_info *info,
 	} else {
 		chip->ecc.mode	    = NAND_ECC_SOFT;
 	}
+
+	if (set->ecc_layout != NULL)
+		chip->ecc.layout = set->ecc_layout;
 }
 
 /* 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 ab278d5f63dd..01d175b54bce 100644
--- a/trunk/include/asm-arm/plat-s3c/nand.h
+++ b/trunk/include/asm-arm/plat-s3c/nand.h
@@ -27,6 +27,7 @@ struct s3c2410_nand_set {
 	char			*name;
 	int			*nr_map;
 	struct mtd_partition	*partitions;
+	struct nand_ecclayout	*ecc_layout;
 };
 
 struct s3c2410_platform_nand {