aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-pxa
diff options
context:
space:
mode:
authorPhilipp Zabel <philipp.zabel@gmail.com>2008-06-22 13:00:55 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-07-09 21:32:52 +0100
commite181191acdfde5b1f9690c74a2459dd0a3331c62 (patch)
treeb7386eaaba8cf1fb841601dbc5ee5ba095f891b6 /arch/arm/mach-pxa
parentff279202781c473545862918a8ef1f4ef7712e47 (diff)
[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>
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r--arch/arm/mach-pxa/magician.c2
1 files changed, 1 insertions, 1 deletions
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>