diff options
author | Hartley Sweeten <hartleys@visionengravers.com> | 2009-06-26 16:39:27 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-27 05:41:13 -0400 |
commit | ddf4f3d994651ee2924432a618d9caefed411dc1 (patch) | |
tree | be41ac4eb8bd7ab88ccedba864b729eea9f295e1 /arch/arm/mach-ep93xx | |
parent | 702b59e623c3ca80beaeab79ca5ede4ea23170e2 (diff) |
[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.c | 8 |
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 @@ | |||
17 | #include <linux/module.h> | 17 | #include <linux/module.h> |
18 | #include <linux/seq_file.h> | 18 | #include <linux/seq_file.h> |
19 | #include <linux/io.h> | 19 | #include <linux/io.h> |
20 | #include <linux/gpio.h> | ||
20 | 21 | ||
21 | #include <mach/ep93xx-regs.h> | 22 | #include <mach/hardware.h> |
22 | #include <asm/gpio.h> | ||
23 | 23 | ||
24 | struct ep93xx_gpio_chip { | 24 | struct ep93xx_gpio_chip { |
25 | struct gpio_chip chip; | 25 | struct gpio_chip chip; |
26 | 26 | ||
27 | unsigned int data_reg; | 27 | void __iomem *data_reg; |
28 | unsigned int data_dir_reg; | 28 | void __iomem *data_dir_reg; |
29 | }; | 29 | }; |
30 | 30 | ||
31 | #define to_ep93xx_gpio_chip(c) container_of(c, struct ep93xx_gpio_chip, chip) | 31 | #define to_ep93xx_gpio_chip(c) container_of(c, struct ep93xx_gpio_chip, chip) |