diff --git a/[refs] b/[refs]
index bd2a1d565894..779b10f3e44c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24dead8ac9c8fa78b9bfb45b06080a7018fd2ed3
+refs/heads/master: 016102dea838e8526a4bc57821309f0cd9db81b7
diff --git a/trunk/arch/x86_64/kernel/genapic.c b/trunk/arch/x86_64/kernel/genapic.c
index f3159a496e39..fe416fd4dbe0 100644
--- a/trunk/arch/x86_64/kernel/genapic.c
+++ b/trunk/arch/x86_64/kernel/genapic.c
@@ -72,7 +72,7 @@ void __init clustered_apic_check(void)
 	/* Don't use clustered mode on AMD platforms. */
  	if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD) {
 		genapic = &apic_physflat;
-#ifndef CONFIG_CPU_HOTPLUG
+#ifndef CONFIG_HOTPLUG_CPU
 		/* In the CPU hotplug case we cannot use broadcast mode
 		   because that opens a race when a CPU is removed.
 		   Stay at physflat mode in this case.