git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge mainline (v2.6.34-rc7)
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
plat-mxc
/
pwm.c
diff --git
a/arch/arm/plat-mxc/pwm.c
b/arch/arm/plat-mxc/pwm.c
index 4ff6dfe0428376a1fdecafb9cb683cab8c53d2bf..c36f2630ed939add19c8afe72afbad86d777487b 100644
(file)
--- a/
arch/arm/plat-mxc/pwm.c
+++ b/
arch/arm/plat-mxc/pwm.c
@@
-11,6
+11,7
@@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/platform_device.h>
+#include <linux/slab.h>
#include <linux/err.h>
#include <linux/clk.h>
#include <linux/io.h>