summaryrefslogtreecommitdiffstats
path: root/arch/mips/ar7/gpio.c
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2011-05-20 09:10:04 -0700
committerRandy Dunlap <randy.dunlap@oracle.com>2011-05-20 09:10:04 -0700
commit2f3e4af471e38e0658e701973238ae4b5e50fcd6 (patch)
treefbfc99c0d975e38ff80f4ff3239a9fc0567b8a4d /arch/mips/ar7/gpio.c
parent61516587513c84ac26e68e3ab008dc6e965d0378 (diff)
parentd410fa4ef99112386de5f218dd7df7b4fca910b4 (diff)
downloadlinux-stable-2f3e4af471e38e0658e701973238ae4b5e50fcd6.tar.gz
linux-stable-2f3e4af471e38e0658e701973238ae4b5e50fcd6.tar.bz2
linux-stable-2f3e4af471e38e0658e701973238ae4b5e50fcd6.zip
Merge branch 'docs-security' into docs-move
Diffstat (limited to 'arch/mips/ar7/gpio.c')
-rw-r--r--arch/mips/ar7/gpio.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/mips/ar7/gpio.c b/arch/mips/ar7/gpio.c
index 425dfa5d6e12..bb571bcdb8f2 100644
--- a/arch/mips/ar7/gpio.c
+++ b/arch/mips/ar7/gpio.c
@@ -325,9 +325,7 @@ int __init ar7_gpio_init(void)
size = 0x1f;
}
- gpch->regs = ioremap_nocache(AR7_REGS_GPIO,
- AR7_REGS_GPIO + 0x10);
-
+ gpch->regs = ioremap_nocache(AR7_REGS_GPIO, size);
if (!gpch->regs) {
printk(KERN_ERR "%s: failed to ioremap regs\n",
gpch->chip.label);