From: Scott Wood <scottwood@freescale.com>
Date: Sat, 27 Jun 2015 00:43:58 +0000 (-0500)
Subject: mtd: nand: Fix NAND_USE_BOUNCE_BUFFER flag conflict
X-Git-Tag: omap-for-v4.3/fixes-merge-window~191^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f867db63473f32cce1b868e281ebd42a41f8fad;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed