diff options
author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2011-01-11 06:33:37 -0500 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2011-03-11 09:22:40 -0500 |
commit | a8adc3f01b9a757a0d290b2987af6b998697399f (patch) | |
tree | 78af3ad10c6bb67c09d4080e908fc028cffd8405 /drivers/mtd/maps/physmap_of.c | |
parent | e1d6ee722285278b427007fc3fa4421a0c1b3b3c (diff) |
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/physmap_of.c')
-rw-r--r-- | drivers/mtd/maps/physmap_of.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c index 8506578e6a3..c85be831248 100644 --- a/drivers/mtd/maps/physmap_of.c +++ b/drivers/mtd/maps/physmap_of.c | |||
@@ -104,12 +104,10 @@ static int of_flash_remove(struct platform_device *dev) | |||
104 | return 0; | 104 | return 0; |
105 | dev_set_drvdata(&dev->dev, NULL); | 105 | dev_set_drvdata(&dev->dev, NULL); |
106 | 106 | ||
107 | #ifdef CONFIG_MTD_CONCAT | ||
108 | if (info->cmtd != info->list[0].mtd) { | 107 | if (info->cmtd != info->list[0].mtd) { |
109 | del_mtd_device(info->cmtd); | 108 | del_mtd_device(info->cmtd); |
110 | mtd_concat_destroy(info->cmtd); | 109 | mtd_concat_destroy(info->cmtd); |
111 | } | 110 | } |
112 | #endif | ||
113 | 111 | ||
114 | if (info->cmtd) { | 112 | if (info->cmtd) { |
115 | if (OF_FLASH_PARTS(info)) { | 113 | if (OF_FLASH_PARTS(info)) { |
@@ -334,16 +332,10 @@ static int __devinit of_flash_probe(struct platform_device *dev, | |||
334 | /* | 332 | /* |
335 | * We detected multiple devices. Concatenate them together. | 333 | * We detected multiple devices. Concatenate them together. |
336 | */ | 334 | */ |
337 | #ifdef CONFIG_MTD_CONCAT | ||
338 | info->cmtd = mtd_concat_create(mtd_list, info->list_size, | 335 | info->cmtd = mtd_concat_create(mtd_list, info->list_size, |
339 | dev_name(&dev->dev)); | 336 | dev_name(&dev->dev)); |
340 | if (info->cmtd == NULL) | 337 | if (info->cmtd == NULL) |
341 | err = -ENXIO; | 338 | err = -ENXIO; |
342 | #else | ||
343 | printk(KERN_ERR "physmap_of: multiple devices " | ||
344 | "found but MTD concat support disabled.\n"); | ||
345 | err = -ENXIO; | ||
346 | #endif | ||
347 | } | 339 | } |
348 | if (err) | 340 | if (err) |
349 | goto err_out; | 341 | goto err_out; |