aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/Kconfig
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-10-21 21:17:05 -0400
committerDavid Woodhouse <dwmw2@infradead.org>2006-10-21 21:17:05 -0400
commitc45aa055c32b488fc3fd73c760df372b09acf69a (patch)
tree03bd52a8b843b48185c6b9831c25b5dbf5ac0382 /drivers/mtd/nand/Kconfig
parent784f4d5e66ac1d962091e08fe5a4b238ed8c793d (diff)
parent8dd851de8184bb39c4ea86de20a0ed2496e6eb0d (diff)
Merge git://git.infradead.org/~dwmw2/cafe-2.6
Conflicts: drivers/mtd/nand/Kconfig
Diffstat (limited to 'drivers/mtd/nand/Kconfig')
-rw-r--r--drivers/mtd/nand/Kconfig7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index b4b1656735bd..564f79d16656 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -219,6 +219,13 @@ config MTD_NAND_SHARPSL
219 tristate "Support for NAND Flash on Sharp SL Series (C7xx + others)" 219 tristate "Support for NAND Flash on Sharp SL Series (C7xx + others)"
220 depends on MTD_NAND && ARCH_PXA 220 depends on MTD_NAND && ARCH_PXA
221 221
222config MTD_NAND_CAFE
223 tristate "NAND support for OLPC CAFÉ chip"
224 depends on PCI
225 help
226 Use NAND flash attached to the CAFÉ chip designed for the $100
227 laptop.
228
222config MTD_NAND_CS553X 229config MTD_NAND_CS553X
223 tristate "NAND support for CS5535/CS5536 (AMD Geode companion chip)" 230 tristate "NAND support for CS5535/CS5536 (AMD Geode companion chip)"
224 depends on MTD_NAND && X86_32 && (X86_PC || X86_GENERICARCH) 231 depends on MTD_NAND && X86_32 && (X86_PC || X86_GENERICARCH)