From: Danny Kukawka <danny.kukawka@bisect.de>
Date: Wed, 15 Feb 2012 19:19:25 +0000 (+0100)
Subject: ARM: pxa: fix including linux/gpio.h twice
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=be9bac9d33c0864ac7684c683df5da3b0c38e3b7;p=~shefty%2Frdma-dev.git

ARM: pxa: fix including linux/gpio.h twice

arch/arm/mach-pxa/pxa27x.c included 'linux/gpio.h' twice, remove
the duplicate.

Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de>
Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
---

diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
index aed6cbcf386..c1673b3441d 100644
--- a/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@ -22,7 +22,6 @@
 #include <linux/io.h>
 #include <linux/irq.h>
 #include <linux/i2c/pxa-i2c.h>
-#include <linux/gpio.h>
 
 #include <asm/mach/map.h>
 #include <mach/hardware.h>