diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-04-07 09:59:35 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-04-07 09:59:35 +0200 |
| commit | 4cd023c77942f48efded3e9e47c2be823d5c8d82 (patch) | |
| tree | b6790388da4c11d50cc7b22ee915fc6133b051c0 /drivers/clocksource | |
| parent | 011aec6558e93b01c64202929a6ae90a334a3742 (diff) | |
| parent | e4f81050e098074792730b61563538d9e394e3d6 (diff) | |
| download | barebox-4cd023c77942f48efded3e9e47c2be823d5c8d82.tar.gz barebox-4cd023c77942f48efded3e9e47c2be823d5c8d82.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/clocksource')
| -rw-r--r-- | drivers/clocksource/mvebu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/mvebu.c b/drivers/clocksource/mvebu.c index cf80571263..59bbc4be22 100644 --- a/drivers/clocksource/mvebu.c +++ b/drivers/clocksource/mvebu.c @@ -60,7 +60,7 @@ static int mvebu_timer_probe(struct device_d *dev) struct clk *clk; u32 rate, div, val; - iores = dev_request_mem_resource(dev, 0); + iores = dev_get_resource(dev, IORESOURCE_MEM, 0); if (IS_ERR(iores)) return PTR_ERR(iores); timer_base = IOMEM(iores->start); |