]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
ARM: tegra: remove tegra_timer from tegra_list_clks
authorStephen Warren <swarren@nvidia.com>
Mon, 27 Aug 2012 23:33:14 +0000 (16:33 -0700)
committerStephen Warren <swarren@nvidia.com>
Thu, 6 Sep 2012 17:47:21 +0000 (11:47 -0600)
tegra_time is a struct sys_timer, not a struct clk, so can't be included
in an array of struct clk *.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
arch/arm/mach-tegra/tegra20_clocks_data.c
arch/arm/mach-tegra/tegra30_clocks_data.c

index b5c518ebd50abdbaf7dd825906852d875e012e46..1eb50674721ee0d175d57c336655af0f39930140 100644 (file)
@@ -929,7 +929,6 @@ PERIPH_CLK(pcie_xclk,       NULL,             "pcie_xclk",  74,     0,      26000000,  mux_clk_m,
 static struct clk *tegra_list_clks[] = {
        &tegra_apbdma,
        &tegra_rtc,
-       &tegra_timer,
        &tegra_i2s1,
        &tegra_i2s2,
        &tegra_spdif_out,
index 448a6df57ac9f60ee15423462712e1887cd80827..34b61a4934a3073c5ea27e9f41ab25b270288aa1 100644 (file)
@@ -1142,7 +1142,6 @@ struct clk *tegra_list_clks[] = {
        &tegra_apbdma,
        &tegra_rtc,
        &tegra_kbc,
-       &tegra_timer,
        &tegra_kfuse,
        &tegra_fuse,
        &tegra_fuse_burn,