diff options
Diffstat (limited to 'drivers/mtd/nand/Kconfig')
| -rw-r--r-- | drivers/mtd/nand/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index df25cabb0481..511448ff0ce2 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig | |||
| @@ -134,7 +134,7 @@ config MTD_NAND_S3C2410_HWECC | |||
| 134 | 134 | ||
| 135 | config MTD_NAND_NDFC | 135 | config MTD_NAND_NDFC |
| 136 | tristate "NDFC NanD Flash Controller" | 136 | tristate "NDFC NanD Flash Controller" |
| 137 | depends on 4xx | 137 | depends on 4xx && !PPC_MERGE |
| 138 | select MTD_NAND_ECC_SMC | 138 | select MTD_NAND_ECC_SMC |
| 139 | help | 139 | help |
| 140 | NDFC Nand Flash Controllers are integrated in IBM/AMCC's 4xx SoCs | 140 | NDFC Nand Flash Controllers are integrated in IBM/AMCC's 4xx SoCs |