Browse Source

[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>
Russell King 16 years ago
parent
commit
485bdde787
4 changed files with 2 additions and 8 deletions
  1. 1 1
      arch/arm/Kconfig
  2. 1 1
      arch/arm/common/Kconfig
  3. 0 5
      arch/arm/mach-ixp4xx/Kconfig
  4. 0 1
      arch/arm/mach-pxa/Kconfig

+ 1 - 1
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.
 

+ 1 - 1
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

+ 0 - 5
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

+ 0 - 1
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