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/mailbox.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/mailbox.c')
| -rw-r--r-- | arch/arm/mach-omap2/mailbox.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c index c035ad3426d0..ef57b38a56a4 100644 --- a/arch/arm/mach-omap2/mailbox.c +++ b/arch/arm/mach-omap2/mailbox.c @@ -300,7 +300,7 @@ static int __devinit omap2_mbox_probe(struct platform_device *pdev) dev_err(&pdev->dev, "invalid mem resource\n"); return -ENODEV; } - mbox_base = ioremap(res->start, res->end - res->start); + mbox_base = ioremap(res->start, resource_size(res)); if (!mbox_base) return -ENOMEM; |