ACPI: fix git automerge failure
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
@@ -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,
|
||||||
|
Reference in New Issue
Block a user