[MTD] 4xx: Don't build arch/ppc dependent drivers in arch/powerpc

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=3feb0ff1607ab3b7dcd36b2347f00c41774464c8
Commit:     3feb0ff1607ab3b7dcd36b2347f00c41774464c8
Parent:     b377fd3982ad957c796758a90e2988401a884241
Author:     Josh Boyer <jwboyer at linux.vnet.ibm.com>
AuthorDate: Wed Aug 22 14:30:47 2007 -0500
Committer:  Kumar Gala <galak at kernel.crashing.org>
CommitDate: Wed Aug 22 22:50:54 2007 -0500

    [MTD] 4xx: Don't build arch/ppc dependent drivers in arch/powerpc
    
    These drivers are specific to 4xx support in arch/ppc at the moment.  Make
    sure they don't get built on arch/powerpc.
    
    Signed-off-by: Josh Boyer <jwboyer at linux.vnet.ibm.com>
    Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
---
 drivers/mtd/maps/Kconfig |    4 ++--
 drivers/mtd/nand/Kconfig |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index cc6c734..3a6566a 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -354,7 +354,7 @@ config MTD_CFI_FLAGADM
 
 config MTD_WALNUT
 	tristate "Flash device mapped on IBM 405GP Walnut"
-	depends on MTD_JEDECPROBE && WALNUT
+	depends on MTD_JEDECPROBE && WALNUT && !PPC_MERGE
 	help
 	  This enables access routines for the flash chips on the IBM 405GP
 	  Walnut board. If you have one of these boards and would like to
@@ -370,7 +370,7 @@ config MTD_EBONY
 
 config MTD_OCOTEA
 	tristate "Flash devices mapped on IBM 440GX Ocotea"
-	depends on MTD_CFI && OCOTEA
+	depends on MTD_CFI && OCOTEA && !PPC_MERGE
 	help
 	  This enables access routines for the flash chips on the IBM 440GX
 	  Ocotea board. If you have one of these boards and would like to
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index f1d60b6..a783d62 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -134,7 +134,7 @@ config MTD_NAND_S3C2410_HWECC
 
 config MTD_NAND_NDFC
 	tristate "NDFC NanD Flash Controller"
-	depends on 44x
+	depends on 44x && !PPC_MERGE
 	select MTD_NAND_ECC_SMC
 	help
 	 NDFC Nand Flash Controllers are integrated in EP44x SoCs