Merge tag 'clk-for-linus-3.11' of git://git.linaro.org/people/mturquette/linux

[karo-tx-linux.git] / arch / arm / mach-tegra / common.c

diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c
index ec5836b1e7133d75118f082710337505bc800dcc..b25153e2ebaa4945c3d8d86eaaaa1d41597a8711 100644 (file)
--- a/arch/arm/mach-tegra/common.c
+++ b/arch/arm/mach-tegra/common.c
@@ -23,7 +23,7 @@
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/irqchip.h>
-#include <linux/clk/tegra.h>
+#include <linux/clk-provider.h>
 
 #include <asm/hardware/cache-l2x0.h>
 
@@ -60,7 +60,7 @@ u32 tegra_uart_config[4] = {
 #ifdef CONFIG_OF
 void __init tegra_dt_init_irq(void)
 {
-       tegra_clocks_init();
+       of_clk_init(NULL);
        tegra_pmc_init();
        tegra_init_irq();
        irqchip_init();