git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~keithp/linux into...
[pandora-kernel.git]
/
arch
/
arm
/
mach-davinci
/
board-dm355-evm.c
diff --git
a/arch/arm/mach-davinci/board-dm355-evm.c
b/arch/arm/mach-davinci/board-dm355-evm.c
index
6556628
..
4e0e707
100644
(file)
--- a/
arch/arm/mach-davinci/board-dm355-evm.c
+++ b/
arch/arm/mach-davinci/board-dm355-evm.c
@@
-77,7
+77,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,
.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,
};
.ecc_bits = 4,
};