Skip to content

L
linux
Commit 7e244322 authored by Len Brown's avatar Len Brown
Browse files
Options

ACPI: fix git automerge failure 

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 463e7c7c
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 1 deletion
arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
View file @ 7e244322
...@@ -569,7 +569,6 @@ static int sw_any_bug_found(struct dmi_system_id *d) ...@@ -569,7 +569,6 @@ static int sw_any_bug_found(struct dmi_system_id *d)
return 0; return 0;
} }
#ifdef CONFIG_SMP
static struct dmi_system_id sw_any_bug_dmi_table[] = { static struct dmi_system_id sw_any_bug_dmi_table[] = {
{ {
.callback = sw_any_bug_found, .callback = sw_any_bug_found,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7