diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-03 11:36:41 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-03 11:36:41 -0800 |
| commit | 17f6ee43c336924d1d5fa80c64a270f963304556 (patch) | |
| tree | b4e33ad9579d9653327618a51f65696c77dc1178 /arch/mips/ralink/timer.c | |
| parent | 9bf76ca325d5e9208eb343f7bd4cc666f703ed30 (diff) | |
| parent | cd5d58108e41b0edecc1e7a6468cbe06ce03be3f (diff) | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle:
"Three fixes across arch/mips with the most complex one being the GIC
interrupt fix - at nine lines still not monster. I'm confident this
are the final MIPS patches even if there should go for an rc8"
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: ralink: fix return value check in rt_timer_probe()
MIPS: malta: Fix GIC interrupt offsets
MIPS: Perf: Fix 74K cache map
Diffstat (limited to 'arch/mips/ralink/timer.c')
| -rw-r--r-- | arch/mips/ralink/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/ralink/timer.c b/arch/mips/ralink/timer.c index e49241a2c39a..202785709441 100644 --- a/arch/mips/ralink/timer.c +++ b/arch/mips/ralink/timer.c @@ -126,7 +126,7 @@ static int rt_timer_probe(struct platform_device *pdev) return -ENOENT; } - rt->membase = devm_request_and_ioremap(&pdev->dev, res); + rt->membase = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(rt->membase)) return PTR_ERR(rt->membase); |