From dc935e84ddaea00f46699f0d86cfa4ad5eccaaaa Mon Sep 17 00:00:00 2001
From: Maxim Levitsky <maximlevitsky@gmail.com>
Date: Fri, 19 Mar 2010 17:22:54 +0200
Subject: [PATCH] --- yaml --- r: 195919 b: refs/heads/master c:
 e5f710cfc6947e64672b7205f7992515868c7782 h: refs/heads/master i:   195917:
 a7b5ca6b1395aab72fb424e470b5a98c1d3714fb   195915:
 8255b153cd83ec3c74240582cfce125508f0c715   195911:
 221c6c91cf5af2826cf69b09895241e36dee571b   195903:
 b7d89f32f14bc7f07b68dfbd885d389461b356b4 v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/mtd/Kconfig       |  3 ++-
 trunk/drivers/mtd/nand/Kconfig  | 19 ++++++++++++-------
 trunk/drivers/mtd/nand/Makefile |  3 ++-
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 620ece521a0d..dcc84ded57e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca7081d96e39ea276892f0577f9cf37568547e88
+refs/heads/master: e5f710cfc6947e64672b7205f7992515868c7782
diff --git a/trunk/drivers/mtd/Kconfig b/trunk/drivers/mtd/Kconfig
index dbee14d37224..e652080bce5d 100644
--- a/trunk/drivers/mtd/Kconfig
+++ b/trunk/drivers/mtd/Kconfig
@@ -307,8 +307,9 @@ config SSFDC
 
 config SM_FTL
 	tristate "SmartMedia/xD new translation layer"
-	depends on EXPERIMENTAL && BLOCK && MTD_NAND
+	depends on EXPERIMENTAL && BLOCK
 	select MTD_BLKDEVS
+	select MTD_NAND_ECC
 	help
 	  This enables new and very EXPERMENTAL support for SmartMedia/xD
 	  FTL (Flash translation layer).
diff --git a/trunk/drivers/mtd/nand/Kconfig b/trunk/drivers/mtd/nand/Kconfig
index 164bd56b9d1a..b712aedd89fb 100644
--- a/trunk/drivers/mtd/nand/Kconfig
+++ b/trunk/drivers/mtd/nand/Kconfig
@@ -2,11 +2,23 @@ menuconfig MTD_NAND
 	tristate "NAND Device Support"
 	depends on MTD
 	select MTD_NAND_IDS
+	select MTD_NAND_ECC
 	help
 	  This enables support for accessing all type of NAND flash
 	  devices. For further information see
 	  <http://www.linux-mtd.infradead.org/doc/nand.html>.
 
+config MTD_NAND_ECC
+	tristate
+
+config MTD_NAND_ECC_SMC
+	bool "NAND ECC Smart Media byte order"
+	depends on MTD_NAND_ECC
+	default n
+	help
+	  Software ECC according to the Smart Media Specification.
+	  The original Linux implementation had byte 0 and 1 swapped.
+
 if MTD_NAND
 
 config MTD_NAND_VERIFY_WRITE
@@ -18,13 +30,6 @@ config MTD_NAND_VERIFY_WRITE
 	  device thinks the write was successful, a bit could have been
 	  flipped accidentally due to device wear or something else.
 
-config MTD_NAND_ECC_SMC
-	bool "NAND ECC Smart Media byte order"
-	default n
-	help
-	  Software ECC according to the Smart Media Specification.
-	  The original Linux implementation had byte 0 and 1 swapped.
-
 config MTD_SM_COMMON
 	tristate
 	default n
diff --git a/trunk/drivers/mtd/nand/Makefile b/trunk/drivers/mtd/nand/Makefile
index 5fbd1f83afb6..04bccf9d7b53 100644
--- a/trunk/drivers/mtd/nand/Makefile
+++ b/trunk/drivers/mtd/nand/Makefile
@@ -2,7 +2,8 @@
 # linux/drivers/nand/Makefile
 #
 
-obj-$(CONFIG_MTD_NAND)			+= nand.o nand_ecc.o
+obj-$(CONFIG_MTD_NAND)			+= nand.o
+obj-$(CONFIG_MTD_NAND_ECC)		+= nand_ecc.o
 obj-$(CONFIG_MTD_NAND_IDS)		+= nand_ids.o
 obj-$(CONFIG_MTD_SM_COMMON) 		+= sm_common.o