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

diff --cc drivers/mtd/nand/Kconfig
index df25cab,a783d62..511448f
--- 1/drivers/mtd/nand/Kconfig
--- 2/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"