From e2eee57157db365b0dfa1de47c4ac811969972ef Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Thu, 18 Nov 2010 15:02:21 -0800 Subject: [PATCH] --- yaml --- r: 231685 b: refs/heads/master c: 1534b8b09757190ce6e97fa97f9ad77c49082cd8 h: refs/heads/master i: 231683: 706d0673b0b329f8420a9352c5660da2619ec649 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/nand_bbt.c | 3 ++- trunk/include/linux/mtd/nand.h | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7da416226e6f..d652df359170 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cc31822250236ec173bb2aa149ebe2ba35405db2 +refs/heads/master: 1534b8b09757190ce6e97fa97f9ad77c49082cd8 diff --git a/trunk/drivers/mtd/nand/nand_bbt.c b/trunk/drivers/mtd/nand/nand_bbt.c index 586b981f0e61..6ebd869993aa 100644 --- a/trunk/drivers/mtd/nand/nand_bbt.c +++ b/trunk/drivers/mtd/nand/nand_bbt.c @@ -1092,7 +1092,8 @@ static void mark_bbt_region(struct mtd_info *mtd, struct nand_bbt_descr *td) /** * verify_bbt_descr - verify the bad block description - * @bd: the table to verify + * @mtd: MTD device structure + * @bd: the table to verify * * This functions performs a few sanity checks on the bad block description * table. diff --git a/trunk/include/linux/mtd/nand.h b/trunk/include/linux/mtd/nand.h index 63e17d01fde9..1f489b247a29 100644 --- a/trunk/include/linux/mtd/nand.h +++ b/trunk/include/linux/mtd/nand.h @@ -448,6 +448,8 @@ struct nand_buffers { * See the defines for further explanation. * @badblockpos: [INTERN] position of the bad block marker in the oob * area. + * @badblockbits: [INTERN] number of bits to left-shift the bad block + * number * @cellinfo: [INTERN] MLC/multichip data from chip ident * @numchips: [INTERN] number of physical chips * @chipsize: [INTERN] the size of one chip for multichip arrays