From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Tue, 20 Nov 2012 05:49:15 +0000 (+0530)
Subject: mfd: twl6040: Remove duplicate inclusion of linux/err.h
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=dac98aef59eae72c74d9d2464f389f4def15a347;p=deliverable%2Flinux.git

mfd: twl6040: Remove duplicate inclusion of linux/err.h

linux/err.h was included twice.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
---

diff --git a/drivers/mfd/twl6040.c b/drivers/mfd/twl6040.c
index e5f7b795afff..583be76e36a8 100644
--- a/drivers/mfd/twl6040.c
+++ b/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>