diff --git a/[refs] b/[refs]
index a9cdadcc00eb..fb5e4579cc7c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 028151bfed9f94e83a79f3886f93861587de08b4
+refs/heads/master: dbb74540aec2f70660d6ad43414a3d1f3c3aceec
diff --git a/trunk/arch/mips/Kconfig b/trunk/arch/mips/Kconfig
index f588b55c6d0b..2f2fd194b8d6 100644
--- a/trunk/arch/mips/Kconfig
+++ b/trunk/arch/mips/Kconfig
@@ -697,6 +697,10 @@ config GENERIC_ISA_DMA
 	bool
 	select ZONE_DMA
 
+config HOTPLUG_CPU
+	bool
+	default n
+
 config I8259
 	bool