diff --git a/[refs] b/[refs]
index 5c0823e82b38..0c1ebcd4a60a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0a9081b1e75ba62bb4450c5b8e8299a41d25278
+refs/heads/master: 5c5e81aaa821822309fd2663c22c94ca0802e407
diff --git a/trunk/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c b/trunk/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
index 57c880bf0bd6..41e1289f8a42 100644
--- a/trunk/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/trunk/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -402,6 +402,7 @@ static int sw_any_bug_found(struct dmi_system_id *d)
 	return 0;
 }
 
+#ifdef CONFIG_SMP
 static struct dmi_system_id sw_any_bug_dmi_table[] = {
 	{
 		.callback = sw_any_bug_found,
@@ -414,6 +415,7 @@ static struct dmi_system_id sw_any_bug_dmi_table[] = {
 	},
 	{ }
 };
+#endif
 
 static int
 acpi_cpufreq_cpu_init (