[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: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 4853f9df37bd22a037f122bd7d78a9a6600cc474..6c73e963d976a017cfa50e6da27a66899fcfa99e 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -354,7 +354,7 @@ config ARCH_IXP4XX
        select GENERIC_GPIO
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
-       select ZONE_DMA if PCI
+       select DMABOUNCE if PCI
        help
          Support for Intel's IXP4XX (XScale) family of processors.
 

diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig
index 2e32acca02fbb83374c74f67e1fba340cfaa9a2c..86b5e6982660da255a13148a9392dc4d73def0b4 100644 (file)
--- a/arch/arm/common/Kconfig
+++ b/arch/arm/common/Kconfig
@@ -13,10 +13,10 @@ config ICST307
 config SA1111
        bool
        select DMABOUNCE if !ARCH_PXA
-       select ZONE_DMA if !ARCH_PXA
 
 config DMABOUNCE
        bool
+       select ZONE_DMA
 
 config TIMER_ACORN
        bool

diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig
index db8b5fe06c0de1a53582b83c256a838ba6490d8b..2c5a02b8520e4b4a79c8f38ce6e01e7836de441a 100644 (file)
--- a/arch/arm/mach-ixp4xx/Kconfig
+++ b/arch/arm/mach-ixp4xx/Kconfig
@@ -167,11 +167,6 @@ config MACH_GTWX5715
 
 comment "IXP4xx Options"
 
-config DMABOUNCE
-       bool
-       default y
-       depends on PCI
-
 config IXP4XX_INDIRECT_PCI
        bool "Use indirect PCI memory access"
        depends on PCI

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index f27f6b3d6e6f61be1b350c883dcd09cc383501a8..f781873431f39b52bb83f1301ce32a13eae1bb3e 100644 (file)
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -257,7 +257,6 @@ config MACH_ARMCORE
        bool "CompuLab CM-X255/CM-X270 modules"
        select PXA27x
        select IWMMXT
-       select ZONE_DMA if PCI
        select PXA25x
        select PXA_SSP