From: Len Brown <len.brown@intel.com>
Date: Sat, 16 Dec 2006 05:59:38 +0000 (-0500)
Subject: ACPI: fix git automerge failure
X-Git-Tag: v2.6.20-rc2~6^2~8
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=7e244322cd4ea361ef9ee623b3fcb4d9f4ff841c;p=linux.git

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 39bc16bec5aa..18f4715c655d 100644
--- 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,