CRIS: stop checking for MTD_CONCAT

As MTD_CONCAT support is becoming an integral part of MTD core,
there is no need for it's special treatment. So stop checking for
MTD_CONCAT availability.

Acked by Jesper Nilsson <jesper.nilsson@axis.com> for merging this
via the MTD tree.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Acked-by: Stefan Roese <sr@denx.de>
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 0a7a4c11d8b166e362cdd22ed0798d7c3bd2539f..82985032233abd4a76698e7cc4602ca2eaf371f1 100644 (file)
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -275,7 +275,6 @@ config ETRAX_AXISFLASHMAP
        select MTD_CHAR
        select MTD_BLOCK
        select MTD_PARTITIONS
-       select MTD_CONCAT
        select MTD_COMPLEX_MAPPINGS
        help
          This option enables MTD mapping of flash devices.  Needed to use

diff --git a/arch/cris/arch-v10/drivers/axisflashmap.c b/arch/cris/arch-v10/drivers/axisflashmap.c
index b2079703af7e381e508d6915d563ab89d8c5ee60..ed708e19d09eb3575c50c05f4c6cf06ee55c854d 100644 (file)
--- a/arch/cris/arch-v10/drivers/axisflashmap.c
+++ b/arch/cris/arch-v10/drivers/axisflashmap.c
@@ -234,7 +234,6 @@ static struct mtd_info *flash_probe(void)
        }
 
        if (mtd_cse0 && mtd_cse1) {
-#ifdef CONFIG_MTD_CONCAT
                struct mtd_info *mtds[] = { mtd_cse0, mtd_cse1 };
 
                /* Since the concatenation layer adds a small overhead we
@@ -246,11 +245,6 @@ static struct mtd_info *flash_probe(void)
                 */
                mtd_cse = mtd_concat_create(mtds, ARRAY_SIZE(mtds),
                                            "cse0+cse1");
-#else
-               printk(KERN_ERR "%s and %s: Cannot concatenate due to kernel "
-                      "(mis)configuration!\n", map_cse0.name, map_cse1.name);
-               mtd_cse = NULL;
-#endif
                if (!mtd_cse) {
                        printk(KERN_ERR "%s and %s: Concatenation failed!\n",
                               map_cse0.name, map_cse1.name);

diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig
index a2dd740c5907868f54985a1176ea73df3d752c63..1633b120aa81a413b00422629cdbc61a4310ce4a 100644 (file)
--- a/arch/cris/arch-v32/drivers/Kconfig
+++ b/arch/cris/arch-v32/drivers/Kconfig
@@ -406,7 +406,6 @@ config ETRAX_AXISFLASHMAP
        select MTD_CHAR
        select MTD_BLOCK
        select MTD_PARTITIONS
-       select MTD_CONCAT
        select MTD_COMPLEX_MAPPINGS
        help
          This option enables MTD mapping of flash devices.  Needed to use

diff --git a/arch/cris/arch-v32/drivers/axisflashmap.c b/arch/cris/arch-v32/drivers/axisflashmap.c
index 51e1e85df96d5407940c0376e28158724f9c5cb1..3d751250271bee38334a41c4b63073ea4beb453d 100644 (file)
--- a/arch/cris/arch-v32/drivers/axisflashmap.c
+++ b/arch/cris/arch-v32/drivers/axisflashmap.c
@@ -275,7 +275,6 @@ static struct mtd_info *flash_probe(void)
        }
 
        if (count > 1) {
-#ifdef CONFIG_MTD_CONCAT
                /* Since the concatenation layer adds a small overhead we
                 * could try to figure out if the chips in cse0 and cse1 are
                 * identical and reprobe the whole cse0+cse1 window. But since
@@ -284,11 +283,6 @@ static struct mtd_info *flash_probe(void)
                 * complicating the probing procedure.
                 */
                mtd_total = mtd_concat_create(mtds, count, "cse0+cse1");
-#else
-               printk(KERN_ERR "%s and %s: Cannot concatenate due to kernel "
-                      "(mis)configuration!\n", map_cse0.name, map_cse1.name);
-               mtd_toal = NULL;
-#endif
                if (!mtd_total) {
                        printk(KERN_ERR "%s and %s: Concatenation failed!\n",
                                map_cse0.name, map_cse1.name);