mtd: nand: Fix NAND_USE_BOUNCE_BUFFER flag conflict
authorScott Wood <scottwood@freescale.com>
Sat, 27 Jun 2015 00:43:58 +0000 (19:43 -0500)
committerBrian Norris <computersforpeace@gmail.com>
Tue, 7 Jul 2015 20:03:25 +0000 (13:03 -0700)
commit5f867db63473f32cce1b868e281ebd42a41f8fad
treebef6984b78d8809404cc4b0716233ee4a8f0fc5f
parent159eeea4cbc142bd5fd396a84cc63345455586a6
mtd: nand: Fix NAND_USE_BOUNCE_BUFFER flag conflict

Commit 66507c7bc8895f0da6b ("mtd: nand: Add support to use nand_base
poi databuf as bounce buffer") added a flag NAND_USE_BOUNCE_BUFFER
using the same bit value as the existing NAND_BUSWIDTH_AUTO.

Cc: Kamal Dasu <kdasu.kdev@gmail.com>
Fixes: 66507c7bc8895f0da6b ("mtd: nand: Add support to use nand_base
poi databuf as bounce buffer")
Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
include/linux/mtd/nand.h