diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-11-28 17:43:10 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-11-28 17:43:10 -0500 |
| commit | 1aaaeabf3622eacd45a94ca9943ea2553b8c34f8 (patch) | |
| tree | 1dbe3c96c8acbff3d81821ac27747ad017551d18 /drivers/mtd/nand/Kconfig | |
| parent | 7014568bad55c20b7ee4f439d78c9e875912d51f (diff) | |
| parent | cad40654c312fc51bdb520e9be91e29a9742bbcb (diff) | |
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 | |||
| 220 | tristate "Support for NAND Flash on Sharp SL Series (C7xx + others)" | 220 | tristate "Support for NAND Flash on Sharp SL Series (C7xx + others)" |
| 221 | depends on MTD_NAND && ARCH_PXA | 221 | depends on MTD_NAND && ARCH_PXA |
| 222 | 222 | ||
| 223 | config MTD_NAND_CAFE | ||
| 224 | tristate "NAND support for OLPC CAFÉ chip" | ||
| 225 | depends on PCI | ||
| 226 | help | ||
| 227 | Use NAND flash attached to the CAFÉ chip designed for the $100 | ||
| 228 | laptop. | ||
| 229 | |||
| 223 | config MTD_NAND_CS553X | 230 | config MTD_NAND_CS553X |
| 224 | tristate "NAND support for CS5535/CS5536 (AMD Geode companion chip)" | 231 | tristate "NAND support for CS5535/CS5536 (AMD Geode companion chip)" |
| 225 | depends on MTD_NAND && X86_32 && (X86_PC || X86_GENERICARCH) | 232 | depends on MTD_NAND && X86_32 && (X86_PC || X86_GENERICARCH) |