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 'timers-for-linus-urgent' of git://git.kernel.org/pub/scm/linux/kernel...
[safe/jmp/linux-2.6]
/
drivers
/
regulator
/
max1586.c
diff --git
a/drivers/regulator/max1586.c
b/drivers/regulator/max1586.c
index
c0b09e1
..
b3c1afc
100644
(file)
--- a/
drivers/regulator/max1586.c
+++ b/
drivers/regulator/max1586.c
@@
-22,6
+22,7
@@
#include <linux/i2c.h>
#include <linux/platform_device.h>
#include <linux/regulator/driver.h>
+#include <linux/slab.h>
#include <linux/regulator/max1586.h>
#define MAX1586_V3_MAX_VSEL 31