---

yaml --- r: 298099 b: refs/heads/master c: 5289966 h: refs/heads/master i: 298097: a826e83 298095: 5025091 v: v3
git-mirror · Mar 26, 2012 · 7db19db · 7db19db
1 parent 4767bfb
commit 7db19db
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b54f47c8bcfc5f766bf13ec31bd7dd1d4726d33b
+refs/heads/master: 5289966ea576a062b80319975b31b661c196ff9d
diff --git a/trunk/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/trunk/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@ -1124,7 +1124,7 @@ static int gpmi_block_markbad(struct mtd_info *mtd, loff_t ofs)
 		chip->bbt[block >> 2] |= 0x01 << ((block & 0x03) << 1);
 
 	/* Do we have a flash based bad block table ? */
-	if (chip->options & NAND_BBT_USE_FLASH)
+	if (chip->bbt_options & NAND_BBT_USE_FLASH)
 		ret = nand_update_bbt(mtd, ofs);
 	else {
 		chipnr = (int)(ofs >> chip->chip_shift);