mtd: nand: renumber conflicting BBT flags
authorBrian Norris <computersforpeace@gmail.com>
Sat, 19 Mar 2011 04:53:41 +0000 (21:53 -0700)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Wed, 25 May 2011 00:49:43 +0000 (01:49 +0100)
commita626743f579aa743473fd8b9215ca198bacf2ac4
treedcaa37fb9599cad5f6f84cd90591b2d8c42597c9
parent9c76b4e531735a6b3b73d982d79559b98c66b11b
mtd: nand: renumber conflicting BBT flags

The NAND_USE_FLASH_BBT_NO_OOB and NAND_CREATE_EMPTY_BBT flags conflict
with the NAND_BBT_SCANBYTE1AND6 and NAND_BBT_DYNAMICSTRUCT flags,
respectively. This change will allow us to utilize these options
independently.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
include/linux/mtd/nand.h