mtd: drop CONFIG_MTD_CONCAT ifdefs

As MTD_CONCAT is becoming a part of mtd core, it's now meaningless
to to check for it in ifdefs. Drop such references from MTD code.

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

1 files changed, 0 insertions, 8 deletions

diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index 4c18b98a3110..7522df4f71f1 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -59,10 +59,8 @@ static int physmap_flash_remove(struct platform_device *dev)
 #else
                 del_mtd_device(info->cmtd);
 #endif
-#ifdef CONFIG_MTD_CONCAT
                 if (info->cmtd != info->mtd[0])
                         mtd_concat_destroy(info->cmtd);
-#endif
         }
 
         for (i = 0; i < MAX_RESOURCES; i++) {
@@ -159,15 +157,9 @@ static int physmap_flash_probe(struct platform_device *dev)
                 /*
                  * We detected multiple devices. Concatenate them together.
                  */
-#ifdef CONFIG_MTD_CONCAT
                 info->cmtd = mtd_concat_create(info->mtd, devices_found, dev_name(&dev->dev));
                 if (info->cmtd == NULL)
                         err = -ENXIO;
-#else
-                printk(KERN_ERR "physmap-flash: multiple devices "
-                       "found but MTD concat support disabled.\n");
-                err = -ENXIO;
-#endif
         }
         if (err)
                 goto err_out;