From 587ff93da210733f451581af406bd6215ba40726 Mon Sep 17 00:00:00 2001 From: Preetham Chandru Date: Wed, 18 Jan 2012 15:13:38 +0530 Subject: tegra: nor: always build partitioning support Remove the CONFIG_MTD_PARTITIONS preprocessor conditionals as partitioning is always available. Moreover as none of the drivers use CONFIG_MTD_PARTITIONS, this has been undefined in Kconfig from 2.6.39 onwords. The following commit 6a8a98b22b10f1560d5f90aded4a54234b9b2724 has removed the CONFIG_MTD_PARTITIONS in Kconfig. Bug: 923135 Change-Id: I8acb6ac2df26d9983b4cfe5869bc97a5861da573 Signed-off-by: Preetham Chandru R Reviewed-on: http://git-master/r/75895 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Shashank Sharma Reviewed-by: Kiran Adduri Reviewed-by: Varun Wadekar --- drivers/mtd/maps/tegra_nor.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'drivers/mtd') diff --git a/drivers/mtd/maps/tegra_nor.c b/drivers/mtd/maps/tegra_nor.c index 34238156ded1..a423bb2b84d0 100644 --- a/drivers/mtd/maps/tegra_nor.c +++ b/drivers/mtd/maps/tegra_nor.c @@ -137,9 +137,7 @@ static inline void snor_tegra_writel(struct tegra_nor_info *tnor, #define DRV_NAME "tegra-nor" -#ifdef CONFIG_MTD_PARTITIONS static const char * const part_probes[] = { "cmdlinepart", NULL }; -#endif static int wait_for_dma_completion(struct tegra_nor_info *info) { @@ -413,7 +411,6 @@ static int tegra_nor_probe(struct platform_device *pdev) info->parts = NULL; platform_set_drvdata(pdev, info); -#ifdef CONFIG_MTD_PARTITIONS err = parse_mtd_partitions(info->mtd, part_probes, &info->parts, 0); if (err > 0) err = add_mtd_partitions(info->mtd, info->parts, err); @@ -422,7 +419,6 @@ static int tegra_nor_probe(struct platform_device *pdev) add_mtd_partitions(info->mtd, plat->flash.parts, plat->flash.nr_parts); else -#endif add_mtd_device(info->mtd); return 0; -- cgit v1.2.3