Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[sfrench/cifs-2.6.git] / arch / arm / mach-s3c / mach-bast.c

diff --git a/arch/arm/mach-s3c/mach-bast.c b/arch/arm/mach-s3c/mach-bast.c
index ad3c7e20954478b912fbf8e77e248be1678a7d28..328f5d9ae9f9b8a2bad6ccc335b91cb7d1e706b7 100644 (file)
--- a/arch/arm/mach-s3c/mach-bast.c
+++ b/arch/arm/mach-s3c/mach-bast.c
@@ -291,7 +291,7 @@ static struct s3c2410_platform_nand __initdata bast_nand_info = {
        .nr_sets        = ARRAY_SIZE(bast_nand_sets),
        .sets           = bast_nand_sets,
        .select_chip    = bast_nand_select,
-       .ecc_mode       = NAND_ECC_SOFT,
+       .engine_type    = NAND_ECC_ENGINE_TYPE_SOFT,
 };
 
 /* DM9000 */