diff options
| author | Len Brown <len.brown@intel.com> | 2006-12-16 06:59:38 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-12-16 06:59:38 +0100 |
| commit | 7e244322cd4ea361ef9ee623b3fcb4d9f4ff841c (patch) | |
| tree | bcffffeb768b904fca87f026e105bac5ecadd776 | |
| parent | Pull trivial into test branch (diff) | |
| download | linux-7e244322cd4ea361ef9ee623b3fcb4d9f4ff841c.tar.xz linux-7e244322cd4ea361ef9ee623b3fcb4d9f4ff841c.zip | |
ACPI: fix git automerge failure
Signed-off-by: Len Brown <len.brown@intel.com>
| -rw-r--r-- | arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c | 1 |
1 files changed, 0 insertions, 1 deletions
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, |