diff --git a/[refs] b/[refs]
index e6753050be19..395874dae7db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29c6a2e6f88225ae2673aabd2de0fa2126653231
+refs/heads/master: a313d758cc7956d7f1e7a727c8fa571b6468fabf
diff --git a/trunk/drivers/mfd/twl4030-core.c b/trunk/drivers/mfd/twl4030-core.c
index e7ab0035d305..68826f1e36bc 100644
--- a/trunk/drivers/mfd/twl4030-core.c
+++ b/trunk/drivers/mfd/twl4030-core.c
@@ -38,7 +38,7 @@
 #include <linux/i2c.h>
 #include <linux/i2c/twl4030.h>
 
-#ifdef CONFIG_ARM
+#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
 #include <mach/cpu.h>
 #endif