[ARM] 5574/1: ep93xx: gpio.c: fix header includes and __iomem pointers
authorHartley Sweeten <hartleys@visionengravers.com>
Fri, 26 Jun 2009 20:39:27 +0000 (21:39 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 27 Jun 2009 09:41:13 +0000 (10:41 +0100)
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>
arch/arm/mach-ep93xx/gpio.c

index 482cf3d2fbcd5de4c6e841590c200bb4d5d9df8c..7b7a564916f38578b807b850ef60a27f7742bba1 100644 (file)
 #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)