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 #include -#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) -#include -#endif - /* * The TWL4030 "Triton 2" is one of a family of a multi-function "Power * Management and System Companion Device" chips originally designed for