diff options
author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2011-01-11 14:33:37 +0300 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2011-03-11 14:22:40 +0000 |
commit | a8adc3f01b9a757a0d290b2987af6b998697399f (patch) | |
tree | 78af3ad10c6bb67c09d4080e908fc028cffd8405 /drivers/mtd/maps/integrator-flash.c | |
parent | e1d6ee722285278b427007fc3fa4421a0c1b3b3c (diff) | |
download | kernel_samsung_aries-a8adc3f01b9a757a0d290b2987af6b998697399f.zip kernel_samsung_aries-a8adc3f01b9a757a0d290b2987af6b998697399f.tar.gz kernel_samsung_aries-a8adc3f01b9a757a0d290b2987af6b998697399f.tar.bz2 |
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/integrator-flash.c')
-rw-r--r-- | drivers/mtd/maps/integrator-flash.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/mtd/maps/integrator-flash.c b/drivers/mtd/maps/integrator-flash.c index 2aac41b..e22ff5a 100644 --- a/drivers/mtd/maps/integrator-flash.c +++ b/drivers/mtd/maps/integrator-flash.c @@ -202,7 +202,6 @@ static int armflash_probe(struct platform_device *dev) if (info->nr_subdev == 1) info->mtd = info->subdev[0].mtd; else if (info->nr_subdev > 1) { -#ifdef CONFIG_MTD_CONCAT struct mtd_info *cdev[info->nr_subdev]; /* @@ -215,11 +214,6 @@ static int armflash_probe(struct platform_device *dev) dev_name(&dev->dev)); if (info->mtd == NULL) err = -ENXIO; -#else - printk(KERN_ERR "armflash: multiple devices found but " - "MTD concat support disabled.\n"); - err = -ENXIO; -#endif } if (err < 0) @@ -244,10 +238,8 @@ static int armflash_probe(struct platform_device *dev) cleanup: if (info->mtd) { del_mtd_partitions(info->mtd); -#ifdef CONFIG_MTD_CONCAT if (info->mtd != info->subdev[0].mtd) mtd_concat_destroy(info->mtd); -#endif } kfree(info->parts); subdev_err: @@ -272,10 +264,8 @@ static int armflash_remove(struct platform_device *dev) if (info) { if (info->mtd) { del_mtd_partitions(info->mtd); -#ifdef CONFIG_MTD_CONCAT if (info->mtd != info->subdev[0].mtd) mtd_concat_destroy(info->mtd); -#endif } kfree(info->parts); |