From b7a949549de42e4cf8af301c63ee8af13a06a956 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 26 Jul 2011 10:45:38 +0100
Subject: ARM: gpio: at91: remove redundant include of mach/gpio.h

asm/gpio.h already directly includes mach/gpio.h.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
 arch/arm/mach-at91/gpio.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'arch/arm/mach-at91/gpio.c')

diff --git a/arch/arm/mach-at91/gpio.c b/arch/arm/mach-at91/gpio.c
index 4615528205c..22250420cee 100644
--- a/arch/arm/mach-at91/gpio.c
+++ b/arch/arm/mach-at91/gpio.c
@@ -22,7 +22,6 @@
 
 #include <mach/hardware.h>
 #include <mach/at91_pio.h>
-#include <mach/gpio.h>
 
 #include <asm/gpio.h>
 
-- 
cgit v1.2.3-18-g5258


From 2f8163baada3dbd0ce891c35bc59ae46e773487a Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 26 Jul 2011 10:53:52 +0100
Subject: ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to
 linux/gpio.h

Convert arch/arm includes of mach/gpio.h and asm/gpio.h to linux/gpio.h
before we start consolidating the individual platform implementations
of the gpio header files.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
 arch/arm/mach-at91/gpio.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'arch/arm/mach-at91/gpio.c')

diff --git a/arch/arm/mach-at91/gpio.c b/arch/arm/mach-at91/gpio.c
index 22250420cee..224e9e2f867 100644
--- a/arch/arm/mach-at91/gpio.c
+++ b/arch/arm/mach-at91/gpio.c
@@ -11,6 +11,7 @@
 
 #include <linux/clk.h>
 #include <linux/errno.h>
+#include <linux/gpio.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/debugfs.h>
@@ -23,8 +24,6 @@
 #include <mach/hardware.h>
 #include <mach/at91_pio.h>
 
-#include <asm/gpio.h>
-
 #include "generic.h"
 
 struct at91_gpio_chip {
-- 
cgit v1.2.3-18-g5258