diff --git a/[refs] b/[refs] index cd25d80dba9a..324bb5ac47b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 862c93b991e7132bafb078ec7ab5a0dee9e27ae6 +refs/heads/master: 552a8278d0becd671274af56a11ee601e585387a diff --git a/trunk/include/linux/mtd/nand.h b/trunk/include/linux/mtd/nand.h index 2071b02f0526..97523887fe5d 100644 --- a/trunk/include/linux/mtd/nand.h +++ b/trunk/include/linux/mtd/nand.h @@ -343,6 +343,7 @@ struct nand_buffers { * @options: [BOARDSPECIFIC] various chip options. They can partly be set to inform nand_scan about * special functionality. See the defines for further explanation * @badblockpos: [INTERN] position of the bad block marker in the oob area + * @cellinfo: [INTERN] MLC/multichip data from chip ident * @numchips: [INTERN] number of physical chips * @chipsize: [INTERN] the size of one chip for multichip arrays * @pagemask: [INTERN] page number mask = number of (pages / chip) - 1