From af0b5fc776a38891de107f50334b934e62e0a1f1 Mon Sep 17 00:00:00 2001
From: Nicolas Pitre <nico@cam.org>
Date: Tue, 7 Oct 2008 20:14:55 +0100
Subject: [PATCH] --- yaml --- r: 112323 b: refs/heads/master c:
 3bca103a1e658d23737d20e1989139d9ca8973bf h: refs/heads/master i:   112321:
 c7cbed7ef159c50eb2966080d3d3646ebcc9a2ce   112319:
 c0588d66b9aea69b42e9b836961c1f7cb731c233 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/arm/Kconfig              | 4 +++-
 trunk/arch/arm/common/Kconfig       | 3 ++-
 trunk/arch/arm/include/asm/memory.h | 2 ++
 trunk/arch/arm/mach-pxa/Kconfig     | 1 +
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 20cdc993555a..8f91adc5f729 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 000b50259271c9c14f6e175795f5164e1d51d35b
+refs/heads/master: 3bca103a1e658d23737d20e1989139d9ca8973bf
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index f5bf38b5f38d..ea52fae33290 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -148,7 +148,6 @@ config ARCH_MAY_HAVE_PC_FDC
 
 config ZONE_DMA
 	bool
-	default y
 
 config GENERIC_ISA_DMA
 	bool
@@ -357,6 +356,7 @@ config ARCH_IXP4XX
 	select GENERIC_GPIO
 	select GENERIC_TIME
 	select GENERIC_CLOCKEVENTS
+	select ZONE_DMA if PCI
 	help
 	  Support for Intel's IXP4XX (XScale) family of processors.
 
@@ -503,6 +503,7 @@ config ARCH_SHARK
 	bool "Shark"
 	select ISA
 	select ISA_DMA
+	select ZONE_DMA
 	select PCI
 	help
 	  Support for the StrongARM based Digital DNARD machine, also known
@@ -524,6 +525,7 @@ config ARCH_DAVINCI
 	select GENERIC_CLOCKEVENTS
 	select GENERIC_GPIO
 	select HAVE_CLK
+	select ZONE_DMA
 	help
 	  Support for TI's DaVinci platform.
 
diff --git a/trunk/arch/arm/common/Kconfig b/trunk/arch/arm/common/Kconfig
index 3e073467caca..2e32acca02fb 100644
--- a/trunk/arch/arm/common/Kconfig
+++ b/trunk/arch/arm/common/Kconfig
@@ -12,7 +12,8 @@ config ICST307
 
 config SA1111
 	bool
-	select DMABOUNCE
+	select DMABOUNCE if !ARCH_PXA
+	select ZONE_DMA if !ARCH_PXA
 
 config DMABOUNCE
 	bool
diff --git a/trunk/arch/arm/include/asm/memory.h b/trunk/arch/arm/include/asm/memory.h
index 7834adbe1774..809ff9ab853a 100644
--- a/trunk/arch/arm/include/asm/memory.h
+++ b/trunk/arch/arm/include/asm/memory.h
@@ -137,6 +137,8 @@
 
 #ifndef arch_adjust_zones
 #define arch_adjust_zones(node,size,holes) do { } while (0)
+#elif !defined(CONFIG_ZONE_DMA)
+#error "custom arch_adjust_zones() requires CONFIG_ZONE_DMA"
 #endif
 
 /*
diff --git a/trunk/arch/arm/mach-pxa/Kconfig b/trunk/arch/arm/mach-pxa/Kconfig
index e8ee7ec9ff6d..e484f609feda 100644
--- a/trunk/arch/arm/mach-pxa/Kconfig
+++ b/trunk/arch/arm/mach-pxa/Kconfig
@@ -210,6 +210,7 @@ config MACH_ARMCORE
 	bool "CompuLab CM-X270 modules"
 	select PXA27x
 	select IWMMXT
+	select ZONE_DMA if PCI
 
 config MACH_MAGICIAN
 	bool "Enable HTC Magician Support"