Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

[karo-tx-linux.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index 79360cf519bfa86be803a2b890aab9e0a0b3ea40..8ac412b45f1882cee49d35ec6ad8ef58ce04a402 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
 #
@@ -167,3 +163,8 @@ config ZONE_DMA_FLAG
        default "0" if !ZONE_DMA
        default "1"
 
+config NR_QUICK
+       int
+       depends on QUICKLIST
+       default "2" if (SUPERH && !SUPERH64)
+       default "1"