From: Brian Norris Date: Sat, 19 Mar 2011 04:53:41 +0000 (-0700) Subject: mtd: nand: renumber conflicting BBT flags X-Git-Tag: v3.0-rc1~32^2~93 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a626743f579aa743473fd8b9215ca198bacf2ac4;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git 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 Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse --- diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index d441927..c2b9ac4 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -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 */