Merge branch 'mxc-nand' of git://git.pengutronix.de/git/imx/linux-2.6

96178769 · David Woodhouse · 2e386e4b · 1fbff0a6 · 96178769 · 96178769
Commit 96178769 authored Nov 30, 2009 by David Woodhouse
Expand all Show whitespace changes
Inline Side-by-side

Showing with 300 additions and 476 deletions

arch/arm/plat-mxc/include/mach/mxc_nand.h arch/arm/plat-mxc/include/mach/mxc_nand.h +2 -1

drivers/mtd/nand/mxc_nand.c drivers/mtd/nand/mxc_nand.c +298 -475

No files found.
--- a/arch/arm/plat-mxc/include/mach/mxc_nand.h
+++ b/arch/arm/plat-mxc/include/mach/mxc_nand.h
@@ -22,6 +22,7 @@
 struct mxc_nand_platform_data {
 	int width;	/* data bus width in bytes */
-	int hw_ecc;	/* 0 if supress hardware ECC */
+	int hw_ecc:1;	/* 0 if supress hardware ECC */
+	int flash_bbt:1; /* set to 1 to use a flash based bbt */
 };
 #endif /* __ASM_ARCH_NAND_H */
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c