| commit | 62d24d91109c3bcd5a5d3fe6cbe354e65e787300 | [log] [tgz] |
|---|---|---|
| author | David Woodhouse <dwmw2@infradead.org> | Thu Aug 23 10:44:17 2007 +0100 |
| committer | David Woodhouse <dwmw2@infradead.org> | Thu Aug 23 10:44:17 2007 +0100 |
| tree | 8f1e64987046b1914d3d1117e6969ca32095a7af | |
| parent | ac0c955d5048c2c580fa7166a89133f0fd76c125 [diff] [blame] | |
| parent | 34a27ffdf59f80fe165f5c56a0be57d55b6da63d [diff] [blame] |
Merge branch 'mtd-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index df25cab..511448f 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig
@@ -134,7 +134,7 @@ config MTD_NAND_NDFC tristate "NDFC NanD Flash Controller" - depends on 4xx + depends on 4xx && !PPC_MERGE select MTD_NAND_ECC_SMC help NDFC Nand Flash Controllers are integrated in IBM/AMCC's 4xx SoCs