]> www.infradead.org Git - users/jedix/linux-maple.git/commit
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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 Aug 2015 03:52:24 +0000 (20:52 -0700)
commitbe9a404609b44c0fd35b40491d387ee5646da2d1
tree070f75abd973b24de6b913e6a00df3aaa7ea9a09
parenta1e6e21f9ed08a436290af81bc3e8b51c8b2cfff
mtd: nand: Fix NAND_USE_BOUNCE_BUFFER flag conflict

commit 5f867db63473f32cce1b868e281ebd42a41f8fad upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
include/linux/mtd/nand.h