git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
[safe/jmp/linux-2.6]
/
drivers
/
regulator
/
userspace-consumer.c
diff --git
a/drivers/regulator/userspace-consumer.c
b/drivers/regulator/userspace-consumer.c
index
44917da
..
9d5ba93
100644
(file)
--- a/
drivers/regulator/userspace-consumer.c
+++ b/
drivers/regulator/userspace-consumer.c
@@
-21,6
+21,7
@@
#include <linux/platform_device.h>
#include <linux/regulator/consumer.h>
#include <linux/regulator/userspace-consumer.h>
+#include <linux/slab.h>
struct userspace_consumer_data {
const char *name;