From: Brian Norris <computersforpeace@gmail.com>
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://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a626743f579aa743473fd8b9215ca198bacf2ac4;p=pandora-kernel.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 <computersforpeace@gmail.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---

Reading git-diff-tree failed