From: Danny Kukawka <danny.kukawka@bisect.de>
Date: Wed, 15 Feb 2012 19:19:38 +0000 (+0100)
Subject: ARM: ux500: included linux/gpio.h twice
X-Git-Tag: firefly_0821_release~3680^2~3254^2~7^2~6
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0e62f9f4961167005718ddc443c2adeccf02c4e6;p=firefly-linux-kernel-4.4.55.git

ARM: ux500: included linux/gpio.h twice

arch/arm/mach-ux500/board-mop500-u8500uib.c included 'linux/gpio.h'
remove the duplicate.

Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de>
Acked-by: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---

diff --git a/arch/arm/mach-ux500/board-mop500-u8500uib.c b/arch/arm/mach-ux500/board-mop500-u8500uib.c
index feb5744d98b7..ead91c968ff4 100644
--- a/arch/arm/mach-ux500/board-mop500-u8500uib.c
+++ b/arch/arm/mach-ux500/board-mop500-u8500uib.c
@@ -8,7 +8,6 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/i2c.h>
-#include <linux/gpio.h>
 #include <linux/interrupt.h>
 #include <linux/mfd/tc3589x.h>
 #include <linux/input/matrix_keypad.h>