From a882286c55b09cda8881c6d905f178f1eb435871 Mon Sep 17 00:00:00 2001 From: Preetham Chandru Date: Wed, 18 Jan 2012 15:01:40 +0530 Subject: tegra: nand: 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: Id75da462c4ec58baf4da72a0f210b02517374de6 Signed-off-by: Preetham Chandru R Reviewed-on: http://git-master/r/75871 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Venu Byravarasu Reviewed-by: Shashank Sharma Reviewed-by: Kiran Adduri Reviewed-by: Varun Wadekar --- drivers/mtd/devices/tegra_nand.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'drivers/mtd') diff --git a/drivers/mtd/devices/tegra_nand.c b/drivers/mtd/devices/tegra_nand.c index 54f4c1f67436..ba90925285e4 100644 --- a/drivers/mtd/devices/tegra_nand.c +++ b/drivers/mtd/devices/tegra_nand.c @@ -70,9 +70,7 @@ /* TODO: pull in the register defs (fields, masks, etc) from Nvidia files * so we don't have to redefine them */ -#ifdef CONFIG_MTD_PARTITIONS static const char *part_probes[] = { "cmdlinepart", NULL, }; -#endif struct tegra_nand_chip { spinlock_t lock; @@ -1645,14 +1643,12 @@ static int __devinit tegra_nand_probe(struct platform_device *pdev) dump_nand_regs(); #endif -#ifdef CONFIG_MTD_PARTITIONS err = parse_mtd_partitions(mtd, part_probes, &info->parts, 0); if (err > 0) { err = mtd_device_register(mtd, info->parts, err); } else if (err <= 0 && plat->parts) { err = mtd_device_register(mtd, plat->parts, plat->nr_parts); } else -#endif err = mtd_device_register(mtd, NULL, 0); if (err != 0) goto out_free_bbbmap; -- cgit v1.2.3