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 git://git.infradead.org/mtd-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-orion5x
/
ts78xx-setup.c
diff --git
a/arch/arm/mach-orion5x/ts78xx-setup.c
b/arch/arm/mach-orion5x/ts78xx-setup.c
index
6c75cd3
..
b35e200
100644
(file)
--- a/
arch/arm/mach-orion5x/ts78xx-setup.c
+++ b/
arch/arm/mach-orion5x/ts78xx-setup.c
@@
-275,7
+275,7
@@
static struct platform_nand_data ts78xx_ts_nand_data = {
.partitions = ts78xx_ts_nand_parts,
.nr_partitions = ARRAY_SIZE(ts78xx_ts_nand_parts),
.chip_delay = 15,
- .
options = NAND_USE_FLASH_BBT
,
+ .
bbt_options = NAND_BBT_USE_FLASH
,
},
.ctrl = {
/*