From mboxrd@z Thu Jan 1 00:00:00 1970 From: haojian.zhuang@gmail.com (Haojian Zhuang) Date: Thu, 22 Mar 2012 06:17:57 +0800 Subject: [PATCH 1/2] ARM: dma-mapping: convert ARCH_HAS_DMA_SET_COHERENT_MASK to kconfig symbol In-Reply-To: <4F6A367D.9090102@gmail.com> References: <4F68CD9C.3090001@windriver.com> <1332296149-28110-1-git-send-email-robherring2@gmail.com> <4F6A367D.9090102@gmail.com> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Thu, Mar 22, 2012 at 4:13 AM, Rob Herring wrote: > On 03/21/2012 03:15 AM, Haojian Zhuang wrote: >> On Wed, Mar 21, 2012 at 10:30 AM, Nicolas Pitre wrote: >>> On Tue, 20 Mar 2012, Rob Herring wrote: >>> >>>> From: Rob Herring >>>> >>>> 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 >>>> Signed-off-by: Rob Herring >>>> Cc: Russell King >>>> Cc: Imre Kaloz >>>> Cc: Krzysztof Halasa >>>> Cc: Eric Miao >>>> Cc: Haojian Zhuang >>>> Cc: Vinod Koul >>>> Cc: Dan Williams >>> >>> Acked-by: Nicolas Pitre >>> >> 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