projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.34-rc6' into x86/cpu
[linux-2.6-block.git]
/
arch
/
x86
/
kernel
/
cpu
/
cpufreq
/
acpi-cpufreq.c
diff --git
a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
index dc68e5c2c0712b6a64cd645b26f1fb8ee13935ca..1d3cddaa40ee66d5730c11e6758a449f680b8cf6 100644
(file)
--- a/
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
@@
-33,6
+33,7
@@
#include <linux/cpufreq.h>
#include <linux/compiler.h>
#include <linux/dmi.h>
+#include <linux/slab.h>
#include <trace/events/power.h>
#include <linux/acpi.h>