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://oss.sgi.com/xfs/xfs
[sfrench/cifs-2.6.git]
/
drivers
/
mfd
/
twl4030-core.c
diff --git
a/drivers/mfd/twl4030-core.c
b/drivers/mfd/twl4030-core.c
index e7ab0035d3054fdfd159b48c9e548150758b986b..68826f1e36bccd057f938919083e6877731025c3 100644
(file)
--- a/
drivers/mfd/twl4030-core.c
+++ b/
drivers/mfd/twl4030-core.c
@@
-38,7
+38,7
@@
#include <linux/i2c.h>
#include <linux/i2c/twl4030.h>
-#if
def CONFIG_ARM
+#if
defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
#include <mach/cpu.h>
#endif