13 files changed, 48 insertions, 4 deletions

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 84caf50725b5..770f717bd250 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -41,6 +41,10 @@ config GENERIC_CALIBRATE_DELAY
         bool
         default y
 
+config ZONE_DMA
+        bool
+        default y
+
 config GENERIC_ISA_DMA
         bool
         default y
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 1523046e092b..fbf4b2a62b60 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -100,6 +100,10 @@ config GENERIC_BUST_SPINLOCK
 config ARCH_MAY_HAVE_PC_FDC
         bool
 
+config ZONE_DMA
+        bool
+        default y
+
 config GENERIC_ISA_DMA
         bool
 
diff --git a/arch/arm26/Kconfig b/arch/arm26/Kconfig
index 74eba8b5a8ca..989113dce415 100644
--- a/arch/arm26/Kconfig
+++ b/arch/arm26/Kconfig
@@ -60,6 +60,10 @@ config GENERIC_CALIBRATE_DELAY
 config GENERIC_BUST_SPINLOCK
         bool
 
+config ZONE_DMA
+        bool
+        default y
+
 config GENERIC_ISA_DMA
         bool
 
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 0dfee812811a..63d5e841caf5 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -38,6 +38,10 @@ config MMU
         bool
         default y
 
+config ZONE_DMA
+        bool
+        default y
+
 config SBUS
         bool
 
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index f383dab973f5..565d0138078e 100644
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -16,6 +16,10 @@ config GENERIC_ISA_DMA
         bool
         default y
 
+config ZONE_DMA
+        bool
+        default y
+
 config GENERIC_HARDIRQS
         bool
         default y
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 70a577c89c7c..0bffbe6e7e11 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -439,6 +439,10 @@ config GENERIC_ISA_DMA
         depends on Q40 || AMIGA_PCMCIA || GG2
         default y
 
+config ZONE_DMA
+        bool
+        default y
+
 source "drivers/pci/Kconfig"
 
 source "drivers/zorro/Kconfig"
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 9d839a9c4b1a..1bc6d249be44 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -8,6 +8,10 @@ mainmenu "Linux/MIPS Kernel Configuration"
 
 menu "Machine selection"
 
+config ZONE_DMA
+        bool
+        default y
+
 choice
         prompt "System type"
         default SGI_IP22
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index f08e80a0bf0a..0088c5ebca78 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -977,6 +977,10 @@ config ISA
           have an IBM RS/6000 or pSeries machine or a PReP machine, say Y.  If
           you have an embedded board, consult your board documentation.
 
+config ZONE_DMA
+        bool
+        default y
+
 config GENERIC_ISA_DMA
         bool
         depends on PPC64 || POWER4 || 6xx && !CPM2
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index c22e60619d9b..0df9c33629fd 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -1177,6 +1177,10 @@ config ISA
           have an IBM RS/6000 or pSeries machine or a PReP machine, say Y.  If
           you have an embedded board, consult your board documentation.
 
+config ZONE_DMA
+        bool
+        default y
+
 config GENERIC_ISA_DMA
         bool
         depends on 6xx && !CPM2
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index d0dec1ea2eed..bd992c0048f0 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -13,6 +13,10 @@ config HIGHMEM
         bool
         default y
 
+config ZONE_DMA
+        bool
+        default y
+
 config GENERIC_ISA_DMA
         bool
         default y
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index d41f66ac7fff..fb84647dbf3d 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -232,6 +232,10 @@ config LARGE_ALLOCS
 
 source "mm/Kconfig"
 
+config ZONE_DMA
+        bool
+        default y
+
 config GENERIC_ISA_DMA
         bool
         default y
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index d4275537b25b..02dd39457bcf 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -44,6 +44,10 @@ config MMU
         bool
         default y
 
+config ZONE_DMA
+        bool
+        default y
+
 config ISA
         bool
 
diff --git a/mm/Kconfig b/mm/Kconfig
index 79360cf519bf..7942b333e46c 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -139,10 +139,6 @@ config SPLIT_PTLOCK_CPUS
         default "4096" if PARISC && !PA20
         default "4"
 
-config ZONE_DMA
-        def_bool y
-        depends on GENERIC_ISA_DMA
-
 #
 # support for page migration
 #