git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-davinci
/
board-da850-evm.c
diff --git
a/arch/arm/mach-davinci/board-da850-evm.c
b/arch/arm/mach-davinci/board-da850-evm.c
index 158ed9a1483fc87582d66de2746620590f800dd5..e22fb40e34bc55be6dd807de63fb9cd009107916 100644
(file)
--- a/
arch/arm/mach-davinci/board-da850-evm.c
+++ b/
arch/arm/mach-davinci/board-da850-evm.c
@@
-244,6
+244,7
@@
static struct davinci_aemif_timing da850_evm_nandflash_timing = {
};
static struct davinci_nand_pdata da850_evm_nandflash_data = {
+ .core_chipsel = 1,
.parts = da850_evm_nandflash_partition,
.nr_parts = ARRAY_SIZE(da850_evm_nandflash_partition),
.ecc_mode = NAND_ECC_HW,