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

Conflicts: drivers/mtd/nand/Kconfig
git-mirror · Oct 22, 2006 · c45aa05 · c45aa05
2 parents 784f4d5 + 8dd851d
commit c45aa05
Show file tree

Hide file tree

Showing 3 changed files with 706 additions and 0 deletions.
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
@@ -219,6 +219,13 @@ config MTD_NAND_SHARPSL
 	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)

diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
@@ -6,6 +6,7 @@
 obj-$(CONFIG_MTD_NAND)			+= nand.o nand_ecc.o
 obj-$(CONFIG_MTD_NAND_IDS)		+= nand_ids.o
 
+obj-$(CONFIG_MTD_NAND_CAFE)		+= cafe_nand.o
 obj-$(CONFIG_MTD_NAND_SPIA)		+= spia.o
 obj-$(CONFIG_MTD_NAND_AMS_DELTA)	+= ams-delta.o
 obj-$(CONFIG_MTD_NAND_TOTO)		+= toto.o