From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Sun, 22 Jun 2008 12:00:55 +0000 (+0100)
Subject: [ARM] 5119/1: magician: include linux/gpio.h instead of asm/gpio.h
X-Git-Tag: v2.6.27-rc1~850^2^2~18^2~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e181191acdfde5b1f9690c74a2459dd0a3331c62;p=linux-2.6-omap-h63xx.git

[ARM] 5119/1: magician: include linux/gpio.h instead of asm/gpio.h

Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c
index 595e8c4902f..6de2c13bd65 100644
--- a/arch/arm/mach-pxa/magician.c
+++ b/arch/arm/mach-pxa/magician.c
@@ -17,6 +17,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
+#include <linux/gpio.h>
 #include <linux/gpio_keys.h>
 #include <linux/input.h>
 #include <linux/mfd/htc-egpio.h>
@@ -27,7 +28,6 @@
 #include <linux/pda_power.h>
 #include <linux/pwm_backlight.h>
 
-#include <asm/gpio.h>
 #include <asm/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>