From: David Woodhouse <dwmw2@infradead.org>
Date: Thu, 23 Aug 2007 09:44:17 +0000 (+0100)
Subject: Merge branch 'mtd-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
X-Git-Tag: v2.6.24-rc1~1364^2~29
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62d24d91109c3bcd5a5d3fe6cbe354e65e787300;p=linux-2.6

Merge branch 'mtd-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
---

62d24d91109c3bcd5a5d3fe6cbe354e65e787300
diff --cc drivers/mtd/nand/Kconfig
index df25cabb04,a783d62f48..511448ff0c
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@@ -134,10 -134,10 +134,10 @@@ config MTD_NAND_S3C2410_HWEC
  
  config MTD_NAND_NDFC
  	tristate "NDFC NanD Flash Controller"
- 	depends on 4xx
 -	depends on 44x && !PPC_MERGE
++	depends on 4xx && !PPC_MERGE
  	select MTD_NAND_ECC_SMC
  	help
 -	 NDFC Nand Flash Controllers are integrated in EP44x SoCs
 +	 NDFC Nand Flash Controllers are integrated in IBM/AMCC's 4xx SoCs
  
  config MTD_NAND_S3C2410_CLKSTOP
  	bool "S3C2410 NAND IDLE clock stop"