]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge git://git.infradead.org/~dwmw2/cafe-2.6
authorDavid Woodhouse <dwmw2@infradead.org>
Sun, 22 Oct 2006 01:17:05 +0000 (02:17 +0100)
committerDavid Woodhouse <dwmw2@infradead.org>
Sun, 22 Oct 2006 01:17:05 +0000 (02:17 +0100)
Conflicts:

drivers/mtd/nand/Kconfig

1  2 
drivers/mtd/nand/Kconfig
drivers/mtd/nand/Makefile

index b4b1656735bd33486eb62c6f36f963f29e0ee702,5e97e63e127a1ff9b0be77f8f1c6c01b05f51951..564f79d166567f2c6326dbe36dddae702ab866dd
@@@ -219,6 -219,6 +219,13 @@@ config MTD_NAND_SHARPS
        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)
Simple merge