OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
463e7c7
)
ACPI: fix git automerge failure
author
Len Brown
<len.brown@intel.com>
Sat, 16 Dec 2006 05:59:38 +0000
(
00:59
-0500)
committer
Len Brown
<len.brown@intel.com>
Sat, 16 Dec 2006 05:59:38 +0000
(
00:59
-0500)
Signed-off-by: Len Brown <len.brown@intel.com>
arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
patch
|
blob
|
history
diff --git
a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
index
39bc16b
..
18f4715
100644
(file)
--- 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,