diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-05-23 04:35:33 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-23 04:35:33 +0200 |
| commit | 8ace5c4698ec8da53e69095596718d5a936433de (patch) | |
| tree | 1f5959b3ac289e3bde420cc14109be0cc518a75a /arch/mips/rb532/gpio.c | |
| parent | sh: fixup fpu.o compile order (diff) | |
| parent | Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6 (diff) | |
| download | linux-8ace5c4698ec8da53e69095596718d5a936433de.tar.xz linux-8ace5c4698ec8da53e69095596718d5a936433de.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Diffstat (limited to 'arch/mips/rb532/gpio.c')
| -rw-r--r-- | arch/mips/rb532/gpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/rb532/gpio.c b/arch/mips/rb532/gpio.c index 37de05d595e7..6c47dfeb7be3 100644 --- a/arch/mips/rb532/gpio.c +++ b/arch/mips/rb532/gpio.c @@ -185,7 +185,7 @@ int __init rb532_gpio_init(void) struct resource *r; r = rb532_gpio_reg0_res; - rb532_gpio_chip->regbase = ioremap_nocache(r->start, r->end - r->start); + rb532_gpio_chip->regbase = ioremap_nocache(r->start, resource_size(r)); if (!rb532_gpio_chip->regbase) { printk(KERN_ERR "rb532: cannot remap GPIO register 0\n"); |