Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1aaaeabf authored by David Woodhouse's avatar David Woodhouse
Browse files

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

parents 7014568b cad40654

drivers/mtd/nand/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -220,6 +220,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)

drivers/mtd/nand/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -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
@@ -24,4 +25,5 @@ obj-$(CONFIG_MTD_NAND_CS553X) += cs553x_nand.o 
obj-$(CONFIG_MTD_NAND_NDFC)		+= ndfc.o

obj-$(CONFIG_MTD_NAND_AT91)		+= at91_nand.o



nand-objs = nand_base.o nand_bbt.o
 
nand-objs := nand_base.o nand_bbt.o

cafe_nand-objs := cafe.o cafe_ecc.o

drivers/mtd/nand/cafe.c

0 → 100644
+771 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/mtd/nand/cafe_ecc.c

0 → 100644
+1381 −0

File added.

Preview size limit exceeded, changes collapsed.