summaryrefslogtreecommitdiff
path: root/drivers/mtd/maps/tegra_nor.c
diff options
context:
space:
mode:
authorPreetham Chandru <pchandru@nvidia.com>2012-01-18 15:13:38 +0530
committerVarun Colbert <vcolbert@nvidia.com>2012-01-19 16:27:05 -0800
commit587ff93da210733f451581af406bd6215ba40726 (patch)
tree1db90d9efcf99c545e8d75fba715e3ac4af751e6 /drivers/mtd/maps/tegra_nor.c
parent58f2a48aba86b1ea804f9b11514d5545dde5a153 (diff)
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 <pchandru@nvidia.com> Reviewed-on: http://git-master/r/75895 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Shashank Sharma <shashanks@nvidia.com> Reviewed-by: Kiran Adduri <kadduri@nvidia.com> Reviewed-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'drivers/mtd/maps/tegra_nor.c')
-rw-r--r--drivers/mtd/maps/tegra_nor.c4
1 files changed, 0 insertions, 4 deletions
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;