projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch '7xx-iosplit-plat' with omap-fixes
[linux-2.6-block.git]
/
drivers
/
mfd
/
twl4030-core.c
diff --git
a/drivers/mfd/twl4030-core.c
b/drivers/mfd/twl4030-core.c
index a1c47ee95c0eef065e591cfeadde949eafb8e414..6cb12502e3065001b51e04ce252988ce831bbc3c 100644
(file)
--- a/
drivers/mfd/twl4030-core.c
+++ b/
drivers/mfd/twl4030-core.c
@@
-39,7
+39,7
@@
#include <linux/i2c/twl4030.h>
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
-#include <
mach
/cpu.h>
+#include <
plat
/cpu.h>
#endif
/*