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-fixes' of git://people.freedesktop.org/~airlied/linux
[pandora-kernel.git]
/
arch
/
cris
/
arch-v32
/
drivers
/
mach-a3
/
nandflash.c
diff --git
a/arch/cris/arch-v32/drivers/mach-a3/nandflash.c
b/arch/cris/arch-v32/drivers/mach-a3/nandflash.c
index
f58f2c1
..
7fb5212
100644
(file)
--- a/
arch/cris/arch-v32/drivers/mach-a3/nandflash.c
+++ b/
arch/cris/arch-v32/drivers/mach-a3/nandflash.c
@@
-163,7
+163,7
@@
struct mtd_info *__init crisv32_nand_flash_probe(void)
this->ecc.mode = NAND_ECC_SOFT;
/* Enable the following for a flash based bad block table */
this->ecc.mode = NAND_ECC_SOFT;
/* Enable the following for a flash based bad block table */
- /* this->
options = NAND_USE_FLASH_BBT
; */
+ /* this->
bbt_options = NAND_BBT_USE_FLASH
; */
/* Scan to find existence of the device */
if (nand_scan(crisv32_mtd, 1)) {
/* Scan to find existence of the device */
if (nand_scan(crisv32_mtd, 1)) {