From 316046a24a23f01bc1ea2557c30b08596a2d4895 Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Tue, 20 Nov 2012 11:19:15 +0530
Subject: [PATCH] --- yaml --- r: 345009 b: refs/heads/master c:
 dac98aef59eae72c74d9d2464f389f4def15a347 h: refs/heads/master i:   345007:
 7cf362760dc45ba26e55214690a3cc0021085071 v: v3

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

diff --git a/[refs] b/[refs]
index 27561a6248d4..095e8836d945 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 442613f974cd6e2ff6faa4b07215240a970f61e7
+refs/heads/master: dac98aef59eae72c74d9d2464f389f4def15a347
diff --git a/trunk/drivers/mfd/twl6040.c b/trunk/drivers/mfd/twl6040.c
index e5f7b795afff..583be76e36a8 100644
--- a/trunk/drivers/mfd/twl6040.c
+++ b/trunk/drivers/mfd/twl6040.c
@@ -37,7 +37,6 @@
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/regmap.h>
-#include <linux/err.h>
 #include <linux/mfd/core.h>
 #include <linux/mfd/twl6040.h>
 #include <linux/regulator/consumer.h>