diff options
author | Jiri Kosina <jkosina@suse.cz> | 2010-05-03 09:25:35 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-05-03 09:25:35 -0400 |
commit | d6d53cbc6b10d28646fb6184d1069f336ec76dc4 (patch) | |
tree | 1c844b3ce8bd430becbbb74875898b08d9f89bb5 /arch/powerpc/sysdev/pmi.c | |
parent | 0b5adf92ec793c665b0de63ac146d190a921c391 (diff) | |
parent | 6a740aa4f47b9f29bad5292cf51f008f3edad9b1 (diff) |
Merge branch 'hid-suspend' into picolcd
Diffstat (limited to 'arch/powerpc/sysdev/pmi.c')
-rw-r--r-- | arch/powerpc/sysdev/pmi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/sysdev/pmi.c b/arch/powerpc/sysdev/pmi.c index aaa915998eb6..652652db4ce2 100644 --- a/arch/powerpc/sysdev/pmi.c +++ b/arch/powerpc/sysdev/pmi.c | |||
@@ -25,6 +25,7 @@ | |||
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include <linux/interrupt.h> | 27 | #include <linux/interrupt.h> |
28 | #include <linux/slab.h> | ||
28 | #include <linux/completion.h> | 29 | #include <linux/completion.h> |
29 | #include <linux/spinlock.h> | 30 | #include <linux/spinlock.h> |
30 | #include <linux/workqueue.h> | 31 | #include <linux/workqueue.h> |