diff options
author | Tony Lindgren <tony@atomide.com> | 2011-11-23 23:46:10 +0100 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-11-23 23:46:10 +0100 |
commit | 52f3a41e0aca5625fbd118ed57a4debb25817e99 (patch) | |
tree | 86730c862fc97eef5f1eb1a81bf74bf2a8a36754 /arch/arm/mach-davinci/board-dm365-evm.c | |
parent | ARM: OMAP: Fix reprogramming of dpll1 rate (diff) | |
parent | ARM: OMAP2+: Fix Compilation error when omap_l3_noc built as module (diff) | |
download | linux-52f3a41e0aca5625fbd118ed57a4debb25817e99.tar.xz linux-52f3a41e0aca5625fbd118ed57a4debb25817e99.zip |
Merge branch 'fixes-v3.2-rc2' into fixes
Diffstat (limited to 'arch/arm/mach-davinci/board-dm365-evm.c')
-rw-r--r-- | arch/arm/mach-davinci/board-dm365-evm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c index 04c43abcca66..1918ae711428 100644 --- a/arch/arm/mach-davinci/board-dm365-evm.c +++ b/arch/arm/mach-davinci/board-dm365-evm.c @@ -139,7 +139,7 @@ static struct davinci_nand_pdata davinci_nand_data = { .parts = davinci_nand_partitions, .nr_parts = ARRAY_SIZE(davinci_nand_partitions), .ecc_mode = NAND_ECC_HW, - .options = NAND_USE_FLASH_BBT, + .bbt_options = NAND_BBT_USE_FLASH, .ecc_bits = 4, }; |