summaryrefslogtreecommitdiffstats
path: root/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2011-11-23 14:46:10 -0800
committerTony Lindgren <tony@atomide.com>2011-11-23 14:46:10 -0800
commit52f3a41e0aca5625fbd118ed57a4debb25817e99 (patch)
tree86730c862fc97eef5f1eb1a81bf74bf2a8a36754 /arch/cris/arch-v32/drivers/mach-fs/nandflash.c
parente9b7086b80c4d9e354f4edc9e280ae85a60df408 (diff)
parent8770b07c2dff3cec2c751b289ee690137c88ea54 (diff)
downloadop-kernel-dev-52f3a41e0aca5625fbd118ed57a4debb25817e99.zip
op-kernel-dev-52f3a41e0aca5625fbd118ed57a4debb25817e99.tar.gz
Merge branch 'fixes-v3.2-rc2' into fixes
Diffstat (limited to 'arch/cris/arch-v32/drivers/mach-fs/nandflash.c')
-rw-r--r--arch/cris/arch-v32/drivers/mach-fs/nandflash.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v32/drivers/mach-fs/nandflash.c b/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
index d5b0cc9..e032384 100644
--- a/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
+++ b/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
@@ -154,7 +154,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->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)) {
OpenPOWER on IntegriCloud