diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-08-23 05:44:17 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-08-23 05:44:17 -0400 |
| commit | 62d24d91109c3bcd5a5d3fe6cbe354e65e787300 (patch) | |
| tree | 8f1e64987046b1914d3d1117e6969ca32095a7af /drivers/mtd/nand | |
| parent | ac0c955d5048c2c580fa7166a89133f0fd76c125 (diff) | |
| parent | 34a27ffdf59f80fe165f5c56a0be57d55b6da63d (diff) | |
Merge branch 'mtd-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
Diffstat (limited to 'drivers/mtd/nand')
| -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 |