Index: linux-2.6.16-rc6-mm2/mm/Kconfig
===================================================================
--- linux-2.6.16-rc6-mm2.orig/mm/Kconfig	2006-03-21 14:51:37.000000000 -0800
+++ linux-2.6.16-rc6-mm2/mm/Kconfig	2006-03-21 15:36:25.000000000 -0800
@@ -138,8 +138,8 @@ config SPLIT_PTLOCK_CPUS
 #
 config MIGRATION
 	bool "Page migration"
-	def_bool y if NUMA || SPARSEMEM || DISCONTIGMEM
-	depends on SWAP
+	def_bool y if NUMA
+	depends on SWAP && NUMA
 	help
 	  Allows the migration of the physical location of pages of processes
 	  while the virtual addresses are not changed. This is useful for