On Thu, Mar 22, 2012 at 4:13 AM, Rob Herring <robherring2@xxxxxxxxx> wrote: > On 03/21/2012 03:15 AM, Haojian Zhuang wrote: >> On Wed, Mar 21, 2012 at 10:30 AM, Nicolas Pitre <nico@xxxxxxxxxxx> wrote: >>> On Tue, 20 Mar 2012, Rob Herring wrote: >>> >>>> From: Rob Herring <rob.herring@xxxxxxxxxxx> >>>> >>>> The only users of ARCH_HAS_DMA_SET_COHERENT_MASK are 2 ARM platforms: >>>> ixp4xx and pxa cm_x2xx. We've been getting lucky that the define is >>>> implicitly included before dma-mapping.h, but the removal of io.h broke >>>> things (c334bc1 ARM: make mach/io.h include optional). Since memory.h >>>> is the correct place, but no longer exists, convert the define to a >>>> kconfig entry. >>>> >>>> Reported-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx> >>>> Signed-off-by: Rob Herring <rob.herring@xxxxxxxxxxx> >>>> Cc: Russell King <linux@xxxxxxxxxxxxxxxx> >>>> Cc: Imre Kaloz <kaloz@xxxxxxxxxxx> >>>> Cc: Krzysztof Halasa <khc@xxxxxxxxx> >>>> Cc: Eric Miao <eric.y.miao@xxxxxxxxx> >>>> Cc: Haojian Zhuang <haojian.zhuang@xxxxxxxxxxx> >>>> Cc: Vinod Koul <vinod.koul@xxxxxxxxx> >>>> Cc: Dan Williams <dan.j.williams@xxxxxxxxx> >>> >>> Acked-by: Nicolas Pitre <nico@xxxxxxxxxx> >>> >> Acked. >> >> Imre & Krzysztof, >> >> Do you mind that I merge these patches into arch-pxa git tree? Since a >> lot of files in arch-pxa are changed. >> > > I plan to send these 2 along with another fix to arm-soc if that's okay. > > Rob No problem -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html