summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-pxa/gpio.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-30 21:26:37 +0100
committerArnd Bergmann <arnd@arndb.de>2011-10-30 21:26:37 +0100
commit91fed558d0f33c74477569f50ed883fe6d430f1f (patch)
tree84b32eb5f9b995efc21e39ee241fed38372d5f3b /arch/arm/plat-pxa/gpio.c
parentMerge branch 'imx/fixes' into next/fixes (diff)
parentARM: pxa/cm-x300: properly set bt_reset pin (diff)
downloadlinux-91fed558d0f33c74477569f50ed883fe6d430f1f.tar.xz
linux-91fed558d0f33c74477569f50ed883fe6d430f1f.zip
Merge branch 'pxa/fixes' into next/fixes
Diffstat (limited to 'arch/arm/plat-pxa/gpio.c')
-rw-r--r--arch/arm/plat-pxa/gpio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-pxa/gpio.c b/arch/arm/plat-pxa/gpio.c
index a11dc3670505..0db7615c2cf0 100644
--- a/arch/arm/plat-pxa/gpio.c
+++ b/arch/arm/plat-pxa/gpio.c
@@ -122,7 +122,7 @@ static int __init pxa_init_gpio_chip(int gpio_end)
struct gpio_chip *c = &chips[i].chip;
sprintf(chips[i].label, "gpio-%d", i);
- chips[i].regbase = (void __iomem *)GPIO_BANK(i);
+ chips[i].regbase = GPIO_BANK(i);
c->base = gpio;
c->label = chips[i].label;