瀏覽代碼

ACPI: fix git automerge failure

Signed-off-by: Len Brown <len.brown@intel.com>
Len Brown 18 年之前
父節點
當前提交
7e244322cd
共有 1 個文件被更改,包括 0 次插入1 次删除
  1. 0 1
      arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c

+ 0 - 1
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,