diff options
author | Rob Herring <rob.herring@calxeda.com> | 2012-03-20 15:33:01 -0400 |
---|---|---|
committer | Rob Herring <rob.herring@calxeda.com> | 2012-03-25 15:35:58 -0400 |
commit | 58af4a244fa9f7ef86f45aa9f8fa835a89274bdd (patch) | |
tree | ebd669001d231a354f4ccc8d885fd4d01b1e6369 /arch/arm/Kconfig | |
parent | a2a47ca36642e3995e982957bc42678cf11ca6ac (diff) |
ARM: dma-mapping: convert ARCH_HAS_DMA_SET_COHERENT_MASK to kconfig symbol
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@windriver.com>
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Nicolas Pitre <nico@linaro.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Imre Kaloz <kaloz@openwrt.org>
Cc: Krzysztof Halasa <khc@pm.waw.pl>
Cc: Eric Miao <eric.y.miao@gmail.com>
Acked-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 31a2ddc2e480..d3999a5f1c71 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -180,6 +180,9 @@ config ZONE_DMA | |||
180 | config NEED_DMA_MAP_STATE | 180 | config NEED_DMA_MAP_STATE |
181 | def_bool y | 181 | def_bool y |
182 | 182 | ||
183 | config ARCH_HAS_DMA_SET_COHERENT_MASK | ||
184 | bool | ||
185 | |||
183 | config GENERIC_ISA_DMA | 186 | config GENERIC_ISA_DMA |
184 | bool | 187 | bool |
185 | 188 | ||
@@ -547,6 +550,7 @@ config ARCH_IXP2000 | |||
547 | config ARCH_IXP4XX | 550 | config ARCH_IXP4XX |
548 | bool "IXP4xx-based" | 551 | bool "IXP4xx-based" |
549 | depends on MMU | 552 | depends on MMU |
553 | select ARCH_HAS_DMA_SET_COHERENT_MASK | ||
550 | select CLKSRC_MMIO | 554 | select CLKSRC_MMIO |
551 | select CPU_XSCALE | 555 | select CPU_XSCALE |
552 | select GENERIC_GPIO | 556 | select GENERIC_GPIO |