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 master.kernel.org:/home/rmk/linux-2.6-arm
[safe/jmp/linux-2.6]
/
drivers
/
mfd
/
twl4030-core.c
diff --git
a/drivers/mfd/twl4030-core.c
b/drivers/mfd/twl4030-core.c
index
4a488be
..
e7ab003
100644
(file)
--- a/
drivers/mfd/twl4030-core.c
+++ b/
drivers/mfd/twl4030-core.c
@@
-38,6
+38,9
@@
#include <linux/i2c.h>
#include <linux/i2c/twl4030.h>
+#ifdef CONFIG_ARM
+#include <mach/cpu.h>
+#endif
/*
* The TWL4030 "Triton 2" is one of a family of a multi-function "Power