summaryrefslogtreecommitdiff
path: root/drivers/clocksource
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-04-09 19:09:35 +0400
committerArnd Bergmann <arnd@arndb.de>2013-04-09 19:09:35 +0400
commit5790c58b133913f92fd737c03efce9db7a1d2d4d (patch)
treedeef8f070b4de7fcff62d496d09842ff91ed83d0 /drivers/clocksource
parent1194b152cd4eff475652785ce366b20afe82dfcf (diff)
parent533ddeb1e86f506129ee388a6cc13796dcf31311 (diff)
downloadlinux-5790c58b133913f92fd737c03efce9db7a1d2d4d.tar.xz
Merge branch 'depends/clk' into next/drivers
This is a snapshot of the stable clk branch at git://git.linaro.org/people/mturquette/linux.git clk-for-3.10 which is a dependency for the tegra clock changes. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/clocksource')
-rw-r--r--drivers/clocksource/sunxi_timer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clocksource/sunxi_timer.c b/drivers/clocksource/sunxi_timer.c
index 4086b9167159..0ce85e29769b 100644
--- a/drivers/clocksource/sunxi_timer.c
+++ b/drivers/clocksource/sunxi_timer.c
@@ -23,7 +23,7 @@
#include <linux/of_address.h>
#include <linux/of_irq.h>
#include <linux/sunxi_timer.h>
-#include <linux/clk-provider.h>
+#include <linux/clk/sunxi.h>
#define TIMER_CTL_REG 0x00
#define TIMER_CTL_ENABLE (1 << 0)
@@ -123,7 +123,7 @@ void __init sunxi_timer_init(void)
if (irq <= 0)
panic("Can't parse IRQ");
- of_clk_init(NULL);
+ sunxi_init_clocks();
clk = of_clk_get(node, 0);
if (IS_ERR(clk))