summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/maps/ceiva.c
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-01-11 12:33:37 +0100
committerDavid Woodhouse <David.Woodhouse@intel.com>2011-03-11 15:22:40 +0100
commita8adc3f01b9a757a0d290b2987af6b998697399f (patch)
tree78af3ad10c6bb67c09d4080e908fc028cffd8405 /drivers/mtd/maps/ceiva.c
parentmtd: drop MTD_CONCAT dependencies from Kconfig (diff)
downloadlinux-a8adc3f01b9a757a0d290b2987af6b998697399f.tar.xz
linux-a8adc3f01b9a757a0d290b2987af6b998697399f.zip
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>
Diffstat (limited to 'drivers/mtd/maps/ceiva.c')
-rw-r--r--drivers/mtd/maps/ceiva.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/mtd/maps/ceiva.c b/drivers/mtd/maps/ceiva.c
index c09f4f57093e..e5f645b775ad 100644
--- a/drivers/mtd/maps/ceiva.c
+++ b/drivers/mtd/maps/ceiva.c
@@ -194,16 +194,10 @@ static int __init clps_setup_mtd(struct clps_info *clps, int nr, struct mtd_info
* We detected multiple devices. Concatenate
* them together.
*/
-#ifdef CONFIG_MTD_CONCAT
*rmtd = mtd_concat_create(subdev, found,
"clps flash");
if (*rmtd == NULL)
ret = -ENXIO;
-#else
- printk(KERN_ERR "clps flash: multiple devices "
- "found but MTD concat support disabled.\n");
- ret = -ENXIO;
-#endif
}
}