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

[linux-2.6-omap-h63xx.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index db7c55de92cdc2ded0583d1ccc5239bdb4828d00..086af703da43345ecf47d6168ca7b84f5616d050 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -117,7 +117,7 @@ config MEMORY_HOTPLUG
        bool "Allow for memory hot-add"
        depends on SPARSEMEM || X86_64_ACPI_NUMA
        depends on HOTPLUG && !SOFTWARE_SUSPEND && ARCH_ENABLE_MEMORY_HOTPLUG
-       depends on (IA64 || X86 || PPC64)
+       depends on (IA64 || X86 || PPC64 || SUPERH)
 
 comment "Memory hotplug is currently incompatible with Software Suspend"
        depends on SPARSEMEM && HOTPLUG && SOFTWARE_SUSPEND
@@ -157,3 +157,18 @@ config RESOURCES_64BIT
        default 64BIT
        help
          This option allows memory and IO resources to be 64 bit.
+
+config ZONE_DMA_FLAG
+       int
+       default "0" if !ZONE_DMA
+       default "1"
+
+config NR_QUICK
+       int
+       depends on QUICKLIST
+       default "2" if (SUPERH && !SUPERH64)
+       default "1"
+
+config VIRT_TO_BUS
+       def_bool y
+       depends on !ARCH_NO_VIRT_TO_BUS