diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-12-14 13:23:03 -0500 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-12-14 13:23:03 -0500 |
| commit | 559300bc0ef7ccd541656f1189d38e7088389559 (patch) | |
| tree | cd1682881ca4246e9c5a1e8632be4bdd9d9706c6 /arch/arm/mach-omap2/mailbox.c | |
| parent | 5416bf33f92a4104dbcd6062bf377c8421ca3cfd (diff) | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
Merge commit 'v2.6.32'
Conflicts:
arch/avr32/mach-at32ap/include/mach/cpu.h
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) | |||
| 300 | dev_err(&pdev->dev, "invalid mem resource\n"); | 300 | dev_err(&pdev->dev, "invalid mem resource\n"); |
| 301 | return -ENODEV; | 301 | return -ENODEV; |
| 302 | } | 302 | } |
| 303 | mbox_base = ioremap(res->start, res->end - res->start); | 303 | mbox_base = ioremap(res->start, resource_size(res)); |
| 304 | if (!mbox_base) | 304 | if (!mbox_base) |
| 305 | return -ENOMEM; | 305 | return -ENOMEM; |
| 306 | 306 | ||