ACPI: fix git automerge failure

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

ACPI: fix git automerge failure
Signed-off-by: N Len Brown <len.brown@intel.com>
7e244322 · Len Brown · 463e7c7c · 7e244322
隐藏空白更改
内联并排

Showing with 0 addition and 1 deletion

arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c +0 -1

未找到文件。
--- 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,