aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2009-11-30 07:35:02 -0500
committerDavid Woodhouse <David.Woodhouse@intel.com>2009-11-30 07:35:02 -0500
commit96178769652ba886d4dfe770e770456689cbb559 (patch)
treeb405f45d4ba9ca6ab90d41f055adb57e08fe7376 /arch
parent2e386e4bac90554887e73d6f342e845185b33fc3 (diff)
parent1fbff0a6e975a986032881f139b806c23680f823 (diff)
Merge branch 'mxc-nand' of git://git.pengutronix.de/git/imx/linux-2.6
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/plat-mxc/include/mach/mxc_nand.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/include/mach/mxc_nand.h b/arch/arm/plat-mxc/include/mach/mxc_nand.h
index 2b972df22d12..5d2d21d414e0 100644
--- a/arch/arm/plat-mxc/include/mach/mxc_nand.h
+++ b/arch/arm/plat-mxc/include/mach/mxc_nand.h
@@ -22,6 +22,7 @@
22 22
23struct mxc_nand_platform_data { 23struct mxc_nand_platform_data {
24 int width; /* data bus width in bytes */ 24 int width; /* data bus width in bytes */
25 int hw_ecc; /* 0 if supress hardware ECC */ 25 int hw_ecc:1; /* 0 if supress hardware ECC */
26 int flash_bbt:1; /* set to 1 to use a flash based bbt */
26}; 27};
27#endif /* __ASM_ARCH_NAND_H */ 28#endif /* __ASM_ARCH_NAND_H */