mtd: make MTD_CONCAT support mandatory

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=4d42942cff0785d8a153bafcd62b6870726cd5f1
Commit:     4d42942cff0785d8a153bafcd62b6870726cd5f1
Parent:     c804c733846572ca85c2bba60c7fe6fa024dff18
Author:     Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>
AuthorDate: Tue Jan 11 14:33:35 2011 +0300
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Fri Mar 11 14:22:40 2011 +0000

    mtd: make MTD_CONCAT support mandatory
    
    Move mtdconcat to be an integral part of the mtd core. It's a tiny bit
    of code, which bears 'say Y if you don't know what to do' note in the
    Kconfig. OTOH there are several ugly ifdefs depending on the MTD_CONCAT.
    So, making MTD_CONCAT support mandatory will allow us to clean up code a
    lot.
    
    Kconfig entry is changed to be a bool defaulting to Y, so all code
    pieces depending on it, will have MTD_CONCAT Kconfig symbol and
    CONFIG_MTD_CONCAT define. This will be removed in one of next patches.
    
    Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>
    Acked-by: Stefan Roese <sr at denx.de>
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy at nokia.com>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 drivers/mtd/Kconfig  |    3 ++-
 drivers/mtd/Makefile |    3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 7741470..c800247 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -34,7 +34,8 @@ config MTD_TESTS
 	  various checks and verifications when loaded.
 
 config MTD_CONCAT
-	tristate "MTD concatenating support"
+	bool
+	default y
 	help
 	  Support for concatenating several MTD devices into a single
 	  (virtual) one. This allows you to have -for example- a JFFS(2)
diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
index d4e7f25..eff3dd5 100644
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@ -4,11 +4,10 @@
 
 # Core functionality.
 obj-$(CONFIG_MTD)		+= mtd.o
-mtd-y				:= mtdcore.o mtdsuper.o
+mtd-y				:= mtdcore.o mtdsuper.o mtdconcat.o
 mtd-$(CONFIG_MTD_PARTITIONS)	+= mtdpart.o
 mtd-$(CONFIG_MTD_OF_PARTS)	+= ofpart.o
 
-obj-$(CONFIG_MTD_CONCAT)	+= mtdconcat.o
 obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
 obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
 obj-$(CONFIG_MTD_AFS_PARTS)	+= afs.o