summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2012-08-27 16:33:14 -0700
committerStephen Warren <swarren@nvidia.com>2012-09-06 11:47:21 -0600
commit20f4665831cec65d6e5d33587bba28ffa536b91d (patch)
tree383f604a190c7f04593d918e5b51e0986705936c
parent9c54db6d3973ad1e8063932a4b0c6f32488f3ba8 (diff)
downloadblackbird-op-linux-20f4665831cec65d6e5d33587bba28ffa536b91d.tar.gz
blackbird-op-linux-20f4665831cec65d6e5d33587bba28ffa536b91d.zip
ARM: tegra: remove tegra_timer from tegra_list_clks
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>
-rw-r--r--arch/arm/mach-tegra/tegra20_clocks_data.c1
-rw-r--r--arch/arm/mach-tegra/tegra30_clocks_data.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/tegra20_clocks_data.c b/arch/arm/mach-tegra/tegra20_clocks_data.c
index b5c518ebd50a..1eb50674721e 100644
--- a/arch/arm/mach-tegra/tegra20_clocks_data.c
+++ b/arch/arm/mach-tegra/tegra20_clocks_data.c
@@ -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,
diff --git a/arch/arm/mach-tegra/tegra30_clocks_data.c b/arch/arm/mach-tegra/tegra30_clocks_data.c
index 448a6df57ac9..34b61a4934a3 100644
--- a/arch/arm/mach-tegra/tegra30_clocks_data.c
+++ b/arch/arm/mach-tegra/tegra30_clocks_data.c
@@ -1142,7 +1142,6 @@ struct clk *tegra_list_clks[] = {
&tegra_apbdma,
&tegra_rtc,
&tegra_kbc,
- &tegra_timer,
&tegra_kfuse,
&tegra_fuse,
&tegra_fuse_burn,
OpenPOWER on IntegriCloud