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 branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
[sfrench/cifs-2.6.git]
/
drivers
/
regulator
/
ab3100.c
diff --git
a/drivers/regulator/ab3100.c
b/drivers/regulator/ab3100.c
index 65ad2b36ce364c39b965fb202794a019b8673ae3..df4ad8927f0ce88257cb70db8fdfed535f8d17f2 100644
(file)
--- a/
drivers/regulator/ab3100.c
+++ b/
drivers/regulator/ab3100.c
@@
-15,6
+15,7
@@
#include <linux/err.h>
#include <linux/platform_device.h>
#include <linux/regulator/driver.h>
+#include <linux/mfd/ab3100.h>
#include <linux/mfd/abx500.h>
/* LDO registers and some handy masking definitions for AB3100 */