ACPI: fix git automerge failure

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

diff --git a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
index 39bc16bec5aacf8381295243ff2d6eae92170f03..18f4715c655d18a2a453558ac546c9154f93902e 100644 (file)
--- a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/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,