Patchwork mtd: remove dead Kconfig associated with !CONFIG_PPC_MERGE

login
register
mail settings
Submitter Kumar Gala
Date Oct. 10, 2008, 3:50 a.m.
Message ID <1223610606-13096-1-git-send-email-galak@kernel.crashing.org>
Download mbox | patch
Permalink /patch/3681/
State Accepted
Commit 52551beb0519c014fb77e1c78a6888d20e62209c
Headers show

Comments

Kumar Gala - Oct. 10, 2008, 3:50 a.m.
Removed the Kconfig associated with 'NDFC NanD Flash Controller'.
We can't enable !CONFIG_PPC_MERGE so there is no way to enable
this.  Additionally the code needs to get updated for arch/powerpc.

For the time being lets just remove the Kconfig option so we can
actually remove CONFIG_PPC_MERGE.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 drivers/mtd/nand/Kconfig |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)
Josh Boyer - Oct. 10, 2008, 11:40 a.m.
On Thu, Oct 09, 2008 at 10:50:06PM -0500, Kumar Gala wrote:
>Removed the Kconfig associated with 'NDFC NanD Flash Controller'.
>We can't enable !CONFIG_PPC_MERGE so there is no way to enable
>this.  Additionally the code needs to get updated for arch/powerpc.
>
>For the time being lets just remove the Kconfig option so we can
>actually remove CONFIG_PPC_MERGE.
>
>Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

The driver does need fixing, and there are patches for it.  We just
haven't settled on an implementation yet so:

Acked-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>

>---
> drivers/mtd/nand/Kconfig |    7 -------
> 1 files changed, 0 insertions(+), 7 deletions(-)
>
>diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
>index 41f361c..1acdff7 100644
>--- a/drivers/mtd/nand/Kconfig
>+++ b/drivers/mtd/nand/Kconfig
>@@ -163,13 +163,6 @@ config MTD_NAND_S3C2410_HWECC
> 	  incorrect ECC generation, and if using these, the default of
> 	  software ECC is preferable.
> 
>-config MTD_NAND_NDFC
>-	tristate "NDFC NanD Flash Controller"
>-	depends on 4xx && !PPC_MERGE
>-	select MTD_NAND_ECC_SMC
>-	help
>-	 NDFC Nand Flash Controllers are integrated in IBM/AMCC's 4xx SoCs
>-
> config MTD_NAND_S3C2410_CLKSTOP
> 	bool "S3C2410 NAND IDLE clock stop"
> 	depends on MTD_NAND_S3C2410
>-- 
>1.5.5.1
>
>_______________________________________________
>Linuxppc-dev mailing list
>Linuxppc-dev@ozlabs.org
>https://ozlabs.org/mailman/listinfo/linuxppc-dev

Patch

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 41f361c..1acdff7 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -163,13 +163,6 @@  config MTD_NAND_S3C2410_HWECC
 	  incorrect ECC generation, and if using these, the default of
 	  software ECC is preferable.
 
-config MTD_NAND_NDFC
-	tristate "NDFC NanD Flash Controller"
-	depends on 4xx && !PPC_MERGE
-	select MTD_NAND_ECC_SMC
-	help
-	 NDFC Nand Flash Controllers are integrated in IBM/AMCC's 4xx SoCs
-
 config MTD_NAND_S3C2410_CLKSTOP
 	bool "S3C2410 NAND IDLE clock stop"
 	depends on MTD_NAND_S3C2410