[MTD] [NAND] remove dead Kconfig associated with !CONFIG_PPC_MERGE

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=52551beb0519c014fb77e1c78a6888d20e62209c
Commit:     52551beb0519c014fb77e1c78a6888d20e62209c
Parent:     13f5369704d3c27a07936999f063be3a8a905398
Author:     Kumar Gala <galak at kernel.crashing.org>
AuthorDate: Thu Oct 9 22:50:06 2008 -0500
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Fri Oct 10 07:39:29 2008 +0100

    [MTD] [NAND] remove dead Kconfig associated with !CONFIG_PPC_MERGE
    
    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 at kernel.crashing.org>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.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 18b9ffe..82815dd 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -157,13 +157,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