diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-11-28 22:43:10 +0000 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-11-28 22:43:10 +0000 |
| commit | 1aaaeabf3622eacd45a94ca9943ea2553b8c34f8 (patch) | |
| tree | 1dbe3c96c8acbff3d81821ac27747ad017551d18 /drivers/mtd/nand/Kconfig | |
| parent | 7014568bad55c20b7ee4f439d78c9e875912d51f (diff) | |
| parent | cad40654c312fc51bdb520e9be91e29a9742bbcb (diff) | |
| download | linux-1aaaeabf3622eacd45a94ca9943ea2553b8c34f8.tar.bz2 | |
Merge git://git.infradead.org/~dwmw2/cafe-2.6
Diffstat (limited to 'drivers/mtd/nand/Kconfig')
| -rw-r--r-- | drivers/mtd/nand/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index c600868658ef..06627757f500 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -220,6 +220,13 @@ config MTD_NAND_SHARPSL tristate "Support for NAND Flash on Sharp SL Series (C7xx + others)" depends on MTD_NAND && ARCH_PXA +config MTD_NAND_CAFE + tristate "NAND support for OLPC CAFÉ chip" + depends on PCI + help + Use NAND flash attached to the CAFÉ chip designed for the $100 + laptop. + config MTD_NAND_CS553X tristate "NAND support for CS5535/CS5536 (AMD Geode companion chip)" depends on MTD_NAND && X86_32 && (X86_PC || X86_GENERICARCH) |