aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/alpha/Kconfig4
-rw-r--r--arch/arm/Kconfig4
-rw-r--r--arch/arm26/Kconfig4
-rw-r--r--arch/i386/Kconfig4
-rw-r--r--arch/m32r/Kconfig4
-rw-r--r--arch/m68k/Kconfig4
-rw-r--r--arch/mips/Kconfig4
-rw-r--r--arch/powerpc/Kconfig4
-rw-r--r--arch/ppc/Kconfig4
-rw-r--r--arch/sparc/Kconfig4
-rw-r--r--arch/sparc64/Kconfig4
-rw-r--r--arch/x86_64/Kconfig4
-rw-r--r--mm/Kconfig4
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
41 bool 41 bool
42 default y 42 default y
43 43
44config ZONE_DMA
45 bool
46 default y
47
44config GENERIC_ISA_DMA 48config GENERIC_ISA_DMA
45 bool 49 bool
46 default y 50 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
100config ARCH_MAY_HAVE_PC_FDC 100config ARCH_MAY_HAVE_PC_FDC
101 bool 101 bool
102 102
103config ZONE_DMA
104 bool
105 default y
106
103config GENERIC_ISA_DMA 107config GENERIC_ISA_DMA
104 bool 108 bool
105 109
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
60config GENERIC_BUST_SPINLOCK 60config GENERIC_BUST_SPINLOCK
61 bool 61 bool
62 62
63config ZONE_DMA
64 bool
65 default y
66
63config GENERIC_ISA_DMA 67config GENERIC_ISA_DMA
64 bool 68 bool
65 69
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
38 bool 38 bool
39 default y 39 default y
40 40
41config ZONE_DMA
42 bool
43 default y
44
41config SBUS 45config SBUS
42 bool 46 bool
43 47
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
16 bool 16 bool
17 default y 17 default y
18 18
19config ZONE_DMA
20 bool
21 default y
22
19config GENERIC_HARDIRQS 23config GENERIC_HARDIRQS
20 bool 24 bool
21 default y 25 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
439 depends on Q40 || AMIGA_PCMCIA || GG2 439 depends on Q40 || AMIGA_PCMCIA || GG2
440 default y 440 default y
441 441
442config ZONE_DMA
443 bool
444 default y
445
442source "drivers/pci/Kconfig" 446source "drivers/pci/Kconfig"
443 447
444source "drivers/zorro/Kconfig" 448source "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"
8 8
9menu "Machine selection" 9menu "Machine selection"
10 10
11config ZONE_DMA
12 bool
13 default y
14
11choice 15choice
12 prompt "System type" 16 prompt "System type"
13 default SGI_IP22 17 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
977 have an IBM RS/6000 or pSeries machine or a PReP machine, say Y. If 977 have an IBM RS/6000 or pSeries machine or a PReP machine, say Y. If
978 you have an embedded board, consult your board documentation. 978 you have an embedded board, consult your board documentation.
979 979
980config ZONE_DMA
981 bool
982 default y
983
980config GENERIC_ISA_DMA 984config GENERIC_ISA_DMA
981 bool 985 bool
982 depends on PPC64 || POWER4 || 6xx && !CPM2 986 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
1177 have an IBM RS/6000 or pSeries machine or a PReP machine, say Y. If 1177 have an IBM RS/6000 or pSeries machine or a PReP machine, say Y. If
1178 you have an embedded board, consult your board documentation. 1178 you have an embedded board, consult your board documentation.
1179 1179
1180config ZONE_DMA
1181 bool
1182 default y
1183
1180config GENERIC_ISA_DMA 1184config GENERIC_ISA_DMA
1181 bool 1185 bool
1182 depends on 6xx && !CPM2 1186 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
13 bool 13 bool
14 default y 14 default y
15 15
16config ZONE_DMA
17 bool
18 default y
19
16config GENERIC_ISA_DMA 20config GENERIC_ISA_DMA
17 bool 21 bool
18 default y 22 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
232 232
233source "mm/Kconfig" 233source "mm/Kconfig"
234 234
235config ZONE_DMA
236 bool
237 default y
238
235config GENERIC_ISA_DMA 239config GENERIC_ISA_DMA
236 bool 240 bool
237 default y 241 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
44 bool 44 bool
45 default y 45 default y
46 46
47config ZONE_DMA
48 bool
49 default y
50
47config ISA 51config ISA
48 bool 52 bool
49 53
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
139 default "4096" if PARISC && !PA20 139 default "4096" if PARISC && !PA20
140 default "4" 140 default "4"
141 141
142config ZONE_DMA
143 def_bool y
144 depends on GENERIC_ISA_DMA
145
146# 142#
147# support for page migration 143# support for page migration
148# 144#