Commit a626743f authored Mar 18, 2011 by Brian Norris Committed by David Woodhouse May 25, 2011

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>

parent 9c76b4e5

include/linux/mtd/nand.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -237,9 +237,9 @@ typedef enum {
		* If passed additionally to NAND_USE_FLASH_BBT then BBT code will not touch
		* the OOB area.
		*/
		#define NAND_USE_FLASH_BBT_NO_OOB 0x00100000
		#define NAND_USE_FLASH_BBT_NO_OOB 0x00800000
		/* Create an empty BBT with no vendor information if the BBT is available */
		#define NAND_CREATE_EMPTY_BBT 0x00200000
		#define NAND_CREATE_EMPTY_BBT 0x01000000

		/* Options set by nand scan */
		/* Nand scan has allocated controller struct */