Commit 485bdde7 authored by Russell King's avatar Russell King Committed by Russell King

[ARM] dmabounce requires ZONE_DMA

Rather than having everything that needs DMABOUNCE also select
ZONE_DMA, arrange for DMABOUNCE to select it instead.  This is
far more sensible.
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 71a35d75
...@@ -354,7 +354,7 @@ config ARCH_IXP4XX ...@@ -354,7 +354,7 @@ config ARCH_IXP4XX
select GENERIC_GPIO select GENERIC_GPIO
select GENERIC_TIME select GENERIC_TIME
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select ZONE_DMA if PCI select DMABOUNCE if PCI
help help
Support for Intel's IXP4XX (XScale) family of processors. Support for Intel's IXP4XX (XScale) family of processors.
......
...@@ -13,10 +13,10 @@ config ICST307 ...@@ -13,10 +13,10 @@ config ICST307
config SA1111 config SA1111
bool bool
select DMABOUNCE if !ARCH_PXA select DMABOUNCE if !ARCH_PXA
select ZONE_DMA if !ARCH_PXA
config DMABOUNCE config DMABOUNCE
bool bool
select ZONE_DMA
config TIMER_ACORN config TIMER_ACORN
bool bool
......
...@@ -167,11 +167,6 @@ config MACH_GTWX5715 ...@@ -167,11 +167,6 @@ config MACH_GTWX5715
comment "IXP4xx Options" comment "IXP4xx Options"
config DMABOUNCE
bool
default y
depends on PCI
config IXP4XX_INDIRECT_PCI config IXP4XX_INDIRECT_PCI
bool "Use indirect PCI memory access" bool "Use indirect PCI memory access"
depends on PCI depends on PCI
......
...@@ -257,7 +257,6 @@ config MACH_ARMCORE ...@@ -257,7 +257,6 @@ config MACH_ARMCORE
bool "CompuLab CM-X255/CM-X270 modules" bool "CompuLab CM-X255/CM-X270 modules"
select PXA27x select PXA27x
select IWMMXT select IWMMXT
select ZONE_DMA if PCI
select PXA25x select PXA25x
select PXA_SSP select PXA_SSP
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment