aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ep93xx
diff options
context:
space:
mode:
authorHartley Sweeten <hartleys@visionengravers.com>2009-06-26 21:39:27 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-06-27 10:41:13 +0100
commitddf4f3d994651ee2924432a618d9caefed411dc1 (patch)
treebe41ac4eb8bd7ab88ccedba864b729eea9f295e1 /arch/arm/mach-ep93xx
parent[ARM] 5573/1: ep93xx: ensure typesafe io (diff)
downloadlinux-dev-ddf4f3d994651ee2924432a618d9caefed411dc1.tar.xz
linux-dev-ddf4f3d994651ee2924432a618d9caefed411dc1.zip
[ARM] 5574/1: ep93xx: gpio.c: fix header includes and __iomem pointers
Fix ep93xx gpio.c header includes and __iomem pointers. 1. <linux/gpio.h> should be included instead of <asm/gpio.h> 2. <mach/hardware.h> should be included instead of <mach/ep93xx-regs.h> 3. data_reg and data_dir_reg in struct ep93xx_gpio_chip should be void __iomem pointers not unsigned int Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Acked-by: Ryan Mallon <ryan@bluewatersys.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-ep93xx')
-rw-r--r--arch/arm/mach-ep93xx/gpio.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-ep93xx/gpio.c b/arch/arm/mach-ep93xx/gpio.c
index 482cf3d2fbcd..7b7a564916f3 100644
--- a/arch/arm/mach-ep93xx/gpio.c
+++ b/arch/arm/mach-ep93xx/gpio.c
@@ -17,15 +17,15 @@
#include <linux/module.h>
#include <linux/seq_file.h>
#include <linux/io.h>
+#include <linux/gpio.h>
-#include <mach/ep93xx-regs.h>
-#include <asm/gpio.h>
+#include <mach/hardware.h>
struct ep93xx_gpio_chip {
struct gpio_chip chip;
- unsigned int data_reg;
- unsigned int data_dir_reg;
+ void __iomem *data_reg;
+ void __iomem *data_dir_reg;
};
#define to_ep93xx_gpio_chip(c) container_of(c, struct ep93xx_gpio_chip, chip)