From e5891f348e2592ff4beab5f9baf9d0c220a73b5a Mon Sep 17 00:00:00 2001
From: Felipe Balbi <balbi@ti.com>
Date: Wed, 22 Feb 2012 14:39:09 +0200
Subject: [PATCH] --- yaml --- r: 296891 b: refs/heads/master c:
 5fd32d6a3a0812ef730b7b83031fc00fa4c4075f h: refs/heads/master i:   296889:
 6ff003de01b1d7fd290afeb23751715b93a54a88   296887:
 8294d53b87f48b87b74d626fb2132c0818dca9e7 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/mfd/twl-core.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 0ab578a1b631..2439eb49bc0b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e1786202704f199941f7c2f5c9fe12879de7917
+refs/heads/master: 5fd32d6a3a0812ef730b7b83031fc00fa4c4075f
diff --git a/trunk/drivers/mfd/twl-core.c b/trunk/drivers/mfd/twl-core.c
index a0297f7ac496..140340f9559b 100644
--- a/trunk/drivers/mfd/twl-core.c
+++ b/trunk/drivers/mfd/twl-core.c
@@ -45,10 +45,6 @@
 #include <linux/i2c.h>
 #include <linux/i2c/twl.h>
 
-#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
-#include <plat/cpu.h>
-#endif
-
 /*
  * The TWL4030 "Triton 2" is one of a family of a multi-function "Power
  * Management and System Companion Device" chips originally designed for