From 32322a7802c84cddf93f6c7af1a2948ad5517bd8 Mon Sep 17 00:00:00 2001
From: Timo Lindhorst <lindhors@vnet.ibm.com>
Date: Mon, 27 Nov 2006 13:35:49 +0100
Subject: [PATCH] --- yaml --- r: 45667 b: refs/heads/master c:
 fc029194999a4563d356cdf728e0c44fb7a49105 h: refs/heads/master i:   45665:
 024849ac3de75a4a42d63d5ae44d627b2dd95f64   45663:
 b20c5332668ff90c2654a839a1cf0cbc4f442dde v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/mtd/nand/nand_ecc.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5479443ee544..66ebd056c0c8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28bdd4a72d158083b7c7f56ec4ef5dfaf75d9464
+refs/heads/master: fc029194999a4563d356cdf728e0c44fb7a49105
diff --git a/trunk/drivers/mtd/nand/nand_ecc.c b/trunk/drivers/mtd/nand/nand_ecc.c
index dd438ca47d9a..fde593e5e634 100644
--- a/trunk/drivers/mtd/nand/nand_ecc.c
+++ b/trunk/drivers/mtd/nand/nand_ecc.c
@@ -112,7 +112,7 @@ int nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat,
 	tmp2 |= (reg2 & 0x01) << 0; /* B7 -> B0 */
 
 	/* Calculate final ECC code */
-#ifdef CONFIG_NAND_ECC_SMC
+#ifdef CONFIG_MTD_NAND_ECC_SMC
 	ecc_code[0] = ~tmp2;
 	ecc_code[1] = ~tmp1;
 #else
@@ -148,7 +148,7 @@ int nand_correct_data(struct mtd_info *mtd, u_char *dat,
 {
 	uint8_t s0, s1, s2;
 
-#ifdef CONFIG_NAND_ECC_SMC
+#ifdef CONFIG_MTD_NAND_ECC_SMC
 	s0 = calc_ecc[0] ^ read_ecc[0];
 	s1 = calc_ecc[1] ^ read_ecc[1];
 	s2 = calc_ecc[2] ^ read_ecc[2];