diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2010-02-26 14:04:15 -0500 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-02-26 14:06:24 -0500 |
| commit | a7790532f5b7358c33a6b1834dc2b318de209f31 (patch) | |
| tree | 0ceb9e24b3f54cb5c8453fb5a218e2a94a0f1cce /drivers/mtd/nand/Kconfig | |
| parent | 2764fb4244cc1bc08df3667924ca4a972e90ac70 (diff) | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
The SmartMedia FTL code depends on new kfifo bits from 2.6.33
Diffstat (limited to 'drivers/mtd/nand/Kconfig')
| -rw-r--r-- | drivers/mtd/nand/Kconfig | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index c89aaab15712..7a67218e86fc 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig | |||
| @@ -289,14 +289,6 @@ config MTD_NAND_SHARPSL | |||
| 289 | tristate "Support for NAND Flash on Sharp SL Series (C7xx + others)" | 289 | tristate "Support for NAND Flash on Sharp SL Series (C7xx + others)" |
| 290 | depends on ARCH_PXA | 290 | depends on ARCH_PXA |
| 291 | 291 | ||
| 292 | config MTD_NAND_BASLER_EXCITE | ||
| 293 | tristate "Support for NAND Flash on Basler eXcite" | ||
| 294 | depends on BASLER_EXCITE | ||
| 295 | help | ||
| 296 | This enables the driver for the NAND flash device found on the | ||
| 297 | Basler eXcite Smart Camera. If built as a module, the driver | ||
| 298 | will be named excite_nandflash. | ||
| 299 | |||
| 300 | config MTD_NAND_CAFE | 292 | config MTD_NAND_CAFE |
| 301 | tristate "NAND support for OLPC CAFÉ chip" | 293 | tristate "NAND support for OLPC CAFÉ chip" |
| 302 | depends on PCI | 294 | depends on PCI |