ACPI: fix git automerge failure

Signed-off-by: Len Brown <len.brown@intel.com>

arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c

@@ -569,7 +569,6 @@ 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,