diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-12 14:57:15 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-12 14:57:15 -0800 |
commit | 031fc8f313f55595c677c50b1d6d5c410fadee60 (patch) | |
tree | 28d5afe521f4e0f1295384951ccc405fd303073d /arch/arm/mach-omap2/gpmc.c | |
parent | e04b5ef8b49db87d01a9b3a47fe41a918a0c0ff5 (diff) | |
parent | b029839cf1f3aa095de73aa2acc241f1c65201ab (diff) |
Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
omap3: Decrease cpufreq transition latency
omap3: update Pandora defconfig
omap3: 3430sdp: Enable Linux Regulator framework
omap3: beagle: Fix USB host port power control
omap3: pandora: Fix keypad keymap
omap1: Amstrad Delta defconfig fixes
omap: Fix omapfb/lcdc on OMAP1510 broken when PM set
omap: Use resource_size
omap: Fix race condition in omap dma driver
Diffstat (limited to 'arch/arm/mach-omap2/gpmc.c')
-rw-r--r-- | arch/arm/mach-omap2/gpmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 15876828db23..f8657568b1ba 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c @@ -366,7 +366,7 @@ int gpmc_cs_request(int cs, unsigned long size, unsigned long *base) if (r < 0) goto out; - gpmc_cs_enable_mem(cs, res->start, res->end - res->start + 1); + gpmc_cs_enable_mem(cs, res->start, resource_size(res)); *base = res->start; gpmc_cs_set_reserved(cs, 1); out: |