diff options
| author | Len Brown <len.brown@intel.com> | 2006-12-16 00:59:38 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-12-16 00:59:38 -0500 |
| commit | 7e244322cd4ea361ef9ee623b3fcb4d9f4ff841c (patch) | |
| tree | bcffffeb768b904fca87f026e105bac5ecadd776 /arch/i386 | |
| parent | 463e7c7cf9aaf95dd05e97e1a47854fdf5454cdc (diff) | |
ACPI: fix git automerge failure
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/i386')
| -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) | |||
| 569 | return 0; | 569 | return 0; |
| 570 | } | 570 | } |
| 571 | 571 | ||
| 572 | #ifdef CONFIG_SMP | ||
| 573 | static struct dmi_system_id sw_any_bug_dmi_table[] = { | 572 | static struct dmi_system_id sw_any_bug_dmi_table[] = { |
| 574 | { | 573 | { |
| 575 | .callback = sw_any_bug_found, | 574 | .callback = sw_any_bug_found, |