mtd: nand: split out ECC module

This way drivers could use ecc routines without depedency on whole nand

Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index dbee14d372246b4204d0dfa1fa7b57ec579b0324..e652080bce5d10aa7a9d333bfb750808db97ab63 100644 (file)
--- a/drivers/mtd/Kconfig
+++ b/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/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 164bd56b9d1a9c1f748dc824947a72e800e53671..b712aedd89fba20fe8b7bb1c5353d752ebb9d3f3 100644 (file)
--- a/drivers/mtd/nand/Kconfig
+++ b/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/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index 5fbd1f83afb67554e37e23a5fb0adbec04cefb57..04bccf9d7b53074369d681d5d36dc34e82bf23dd 100644 (file)
--- a/drivers/mtd/nand/Makefile
+++ b/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