Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[~andy/linux] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index 79360cf519bfa86be803a2b890aab9e0a0b3ea40..7942b333e46cd46c11ac0f4a849c7b98efeee58e 100644 (file)
--- 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
 #