diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-08-12 06:28:00 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-08-12 06:28:00 -0400 |
| commit | 742c52533b05d8ae83c794bd6811100675b85ce5 (patch) | |
| tree | de89a81d88c19504d1dc4f023a4b480c9022b3b5 /drivers/mtd/nand/Kconfig | |
| parent | 36cd4fb5d277f34fe9e4db0deac2d4efd7dff735 (diff) | |
| parent | 10fec20ef5eec1c91913baec1225400f0d02df40 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-arm/arch-omap/onenand.h
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 572c842e9f40..8eb2b06cf0d9 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig | |||
| @@ -345,6 +345,13 @@ config MTD_NAND_PASEMI | |||
| 345 | Enables support for NAND Flash interface on PA Semi PWRficient | 345 | Enables support for NAND Flash interface on PA Semi PWRficient |
| 346 | based boards | 346 | based boards |
| 347 | 347 | ||
| 348 | config MTD_NAND_TMIO | ||
| 349 | tristate "NAND Flash device on Toshiba Mobile IO Controller" | ||
| 350 | depends on MTD_NAND && MFD_TMIO | ||
| 351 | help | ||
| 352 | Support for NAND flash connected to a Toshiba Mobile IO | ||
| 353 | Controller in some PDAs, including the Sharp SL6000x. | ||
| 354 | |||
| 348 | config MTD_NAND_NANDSIM | 355 | config MTD_NAND_NANDSIM |
| 349 | tristate "Support for NAND Flash Simulator" | 356 | tristate "Support for NAND Flash Simulator" |
| 350 | depends on MTD_PARTITIONS | 357 | depends on MTD_PARTITIONS |