diff --git a/[refs] b/[refs]
index 2b3b038b91e6..00d6b5b0a9f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2020002a878403a6858868d85a43623f74859dba
+refs/heads/master: 69dd647f969c28d18de77e2153f30d05a1874571
diff --git a/trunk/kernel/smp.c b/trunk/kernel/smp.c
index ad63d8501207..94188b8ecc33 100644
--- a/trunk/kernel/smp.c
+++ b/trunk/kernel/smp.c
@@ -57,7 +57,7 @@ hotplug_cfd(struct notifier_block *nfb, unsigned long action, void *hcpu)
 			return NOTIFY_BAD;
 		break;
 
-#ifdef CONFIG_CPU_HOTPLUG
+#ifdef CONFIG_HOTPLUG_CPU
 	case CPU_UP_CANCELED:
 	case CPU_UP_CANCELED_FROZEN: