From 773f2bb7dc0cb3efeada452a340e10b839ae1351 Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Tue, 22 May 2012 07:30:48 -0700 Subject: [PATCH] --- yaml --- r: 332630 b: refs/heads/master c: 63d99c0e89039e1509209d36ee17fc374fd112c9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/DocBook/mtdnand.tmpl | 2 -- trunk/include/linux/mtd/bbm.h | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index b8d986928261..b5197d79258c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b1ccfab31a0bbcb103989cba3b08df0776ff90fe +refs/heads/master: 63d99c0e89039e1509209d36ee17fc374fd112c9 diff --git a/trunk/Documentation/DocBook/mtdnand.tmpl b/trunk/Documentation/DocBook/mtdnand.tmpl index e0aedb7a7827..fe122d6e686f 100644 --- a/trunk/Documentation/DocBook/mtdnand.tmpl +++ b/trunk/Documentation/DocBook/mtdnand.tmpl @@ -1216,8 +1216,6 @@ in this page #define NAND_BBT_LASTBLOCK 0x00000010 /* The bbt is at the given page, else we must scan for the bbt */ #define NAND_BBT_ABSPAGE 0x00000020 -/* The bbt is at the given page, else we must scan for the bbt */ -#define NAND_BBT_SEARCH 0x00000040 /* bbt is stored per chip on multichip devices */ #define NAND_BBT_PERCHIP 0x00000080 /* bbt has a version counter at offset veroffs */ diff --git a/trunk/include/linux/mtd/bbm.h b/trunk/include/linux/mtd/bbm.h index 650ef352f045..5d9fcb7645ae 100644 --- a/trunk/include/linux/mtd/bbm.h +++ b/trunk/include/linux/mtd/bbm.h @@ -78,8 +78,6 @@ struct nand_bbt_descr { #define NAND_BBT_LASTBLOCK 0x00000010 /* The bbt is at the given page, else we must scan for the bbt */ #define NAND_BBT_ABSPAGE 0x00000020 -/* The bbt is at the given page, else we must scan for the bbt */ -#define NAND_BBT_SEARCH 0x00000040 /* bbt is stored per chip on multichip devices */ #define NAND_BBT_PERCHIP 0x00000080 /* bbt has a version counter at offset veroffs */