diff --git a/[refs] b/[refs]
index 4a740ba1c91b..5104111723a7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6d0e8014a59b641c0669cf5df151667144f220e
+refs/heads/master: 6d740a438fcb8775008dfd3fc18df7f7a0ca2e12
diff --git a/trunk/arch/s390/Kconfig b/trunk/arch/s390/Kconfig
index 098c62c29f9c..b71132166f60 100644
--- a/trunk/arch/s390/Kconfig
+++ b/trunk/arch/s390/Kconfig
@@ -109,10 +109,6 @@ config HOTPLUG_CPU
 	  can be controlled through /sys/devices/system/cpu/cpu#.
 	  Say N if you want to disable CPU hotplug.
 
-config DEFAULT_MIGRATION_COST
-	int
-	default "1000000"
-
 config MATHEMU
 	bool "IEEE FPU emulation"
 	depends on MARCH_G5