diff options
| author | James Morris <jmorris@namei.org> | 2010-05-05 20:56:07 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-05-05 20:56:07 -0400 |
| commit | 0ffbe2699cda6afbe08501098dff8a8c2fe6ae09 (patch) | |
| tree | 81b1a2305d16c873371b65c5a863c0268036cefe /drivers/cpuidle | |
| parent | 4e5d6f7ec3833c0da9cf34fa5c53c6058c5908b6 (diff) | |
| parent | 7ebd467551ed6ae200d7835a84bbda0dcadaa511 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/cpuidle')
| -rw-r--r-- | drivers/cpuidle/sysfs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c index 8719b36e1a4d..0ba9c8b8ee74 100644 --- a/drivers/cpuidle/sysfs.c +++ b/drivers/cpuidle/sysfs.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 10 | #include <linux/cpuidle.h> | 10 | #include <linux/cpuidle.h> |
| 11 | #include <linux/sysfs.h> | 11 | #include <linux/sysfs.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | #include <linux/cpu.h> | 13 | #include <linux/cpu.h> |
| 13 | 14 | ||
| 14 | #include "cpuidle.h" | 15 | #include "cpuidle.h" |