From: David Woodhouse <dwmw2@infradead.org>
Date: Sun, 22 Oct 2006 01:17:05 +0000 (+0100)
Subject: Merge git://git.infradead.org/~dwmw2/cafe-2.6
X-Git-Tag: v2.6.20-rc6~47^2~37^2~12
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c45aa055c32b488fc3fd73c760df372b09acf69a;p=linux-2.6

Merge git://git.infradead.org/~dwmw2/cafe-2.6

Conflicts:

	drivers/mtd/nand/Kconfig
---

c45aa055c32b488fc3fd73c760df372b09acf69a
diff --cc drivers/mtd/nand/Kconfig
index b4b1656735,5e97e63e12..564f79d166
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@@ -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)