diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:09:18 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:09:18 -0400 |
| commit | 68fe0f0a6dcd2ac1ace5da3647a6d1cf0f4d2fea (patch) | |
| tree | 69d855c2e46d42ef8f23680cf3a1e6ff38de9ef4 /Documentation/DocBook/mtdnand.tmpl | |
| parent | 88fd449e734a4264347e12b8ff74ccb33a9b9a35 (diff) | |
| parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
Merge tag 'v3.7-rc3' into for-linus to sync up with recent USB changes
Diffstat (limited to 'Documentation/DocBook/mtdnand.tmpl')
| -rw-r--r-- | Documentation/DocBook/mtdnand.tmpl | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/DocBook/mtdnand.tmpl b/Documentation/DocBook/mtdnand.tmpl index e0aedb7a7827..fe122d6e686f 100644 --- a/Documentation/DocBook/mtdnand.tmpl +++ b/Documentation/DocBook/mtdnand.tmpl | |||
| @@ -1216,8 +1216,6 @@ in this page</entry> | |||
| 1216 | #define NAND_BBT_LASTBLOCK 0x00000010 | 1216 | #define NAND_BBT_LASTBLOCK 0x00000010 |
| 1217 | /* The bbt is at the given page, else we must scan for the bbt */ | 1217 | /* The bbt is at the given page, else we must scan for the bbt */ |
| 1218 | #define NAND_BBT_ABSPAGE 0x00000020 | 1218 | #define NAND_BBT_ABSPAGE 0x00000020 |
| 1219 | /* The bbt is at the given page, else we must scan for the bbt */ | ||
| 1220 | #define NAND_BBT_SEARCH 0x00000040 | ||
| 1221 | /* bbt is stored per chip on multichip devices */ | 1219 | /* bbt is stored per chip on multichip devices */ |
| 1222 | #define NAND_BBT_PERCHIP 0x00000080 | 1220 | #define NAND_BBT_PERCHIP 0x00000080 |
| 1223 | /* bbt has a version counter at offset veroffs */ | 1221 | /* bbt has a version counter at offset veroffs */ |