Merge branch 'for-next' of git://www.jni.nu/cris into cris_merge
[linux-2.6] / arch / sh / mm / Kconfig
index 8a03926..555ec97 100644 (file)
@@ -132,7 +132,11 @@ config ARCH_SELECT_MEMORY_MODEL
 
 config ARCH_ENABLE_MEMORY_HOTPLUG
        def_bool y
-       depends on SPARSEMEM
+       depends on SPARSEMEM && MMU
+
+config ARCH_ENABLE_MEMORY_HOTREMOVE
+       def_bool y
+       depends on SPARSEMEM && MMU
 
 config ARCH_MEMORY_PROBE
        def_bool y