X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=mm%2FKconfig;h=e24d348083c34da69472bc22a9b7025d562a3ffe;hb=dcbdc93c6c64daf20622d6deae774d1e740efb8d;hp=1ac718f636ec6f5842217bd6b06c7ef0bff0dd21;hpb=2d56d3c43cc97ae48586745556f5a5b564d61582;p=mv-sheeva.git

diff --git a/mm/Kconfig b/mm/Kconfig
index 1ac718f636e..e24d348083c 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -116,11 +116,11 @@ config SPARSEMEM_EXTREME
 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 HOTPLUG && !HIBERNATION && ARCH_ENABLE_MEMORY_HOTPLUG
+	depends on (IA64 || X86 || PPC64 || SUPERH)
 
 comment "Memory hotplug is currently incompatible with Software Suspend"
-	depends on SPARSEMEM && HOTPLUG && SOFTWARE_SUSPEND
+	depends on SPARSEMEM && HOTPLUG && HIBERNATION
 
 config MEMORY_HOTPLUG_SPARSE
 	def_bool y
@@ -163,8 +163,16 @@ config ZONE_DMA_FLAG
 	default "0" if !ZONE_DMA
 	default "1"
 
+config BOUNCE
+	def_bool y
+	depends on BLOCK && MMU && (ZONE_DMA || HIGHMEM)
+
 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