From 6610d5c588f57f4ee3461f9f43c71f8e796341eb Mon Sep 17 00:00:00 2001
From: Stephen Warren <swarren@nvidia.com>
Date: Mon, 27 Aug 2012 16:33:14 -0700
Subject: [PATCH] --- yaml --- r: 326646 b: refs/heads/master c:
 20f4665831cec65d6e5d33587bba28ffa536b91d h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/arch/arm/mach-tegra/tegra20_clocks_data.c | 1 -
 trunk/arch/arm/mach-tegra/tegra30_clocks_data.c | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b2a62978d13e..50f26d3ec142 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c54db6d3973ad1e8063932a4b0c6f32488f3ba8
+refs/heads/master: 20f4665831cec65d6e5d33587bba28ffa536b91d
diff --git a/trunk/arch/arm/mach-tegra/tegra20_clocks_data.c b/trunk/arch/arm/mach-tegra/tegra20_clocks_data.c
index b5c518ebd50a..1eb50674721e 100644
--- a/trunk/arch/arm/mach-tegra/tegra20_clocks_data.c
+++ b/trunk/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/trunk/arch/arm/mach-tegra/tegra30_clocks_data.c b/trunk/arch/arm/mach-tegra/tegra30_clocks_data.c
index 448a6df57ac9..34b61a4934a3 100644
--- a/trunk/arch/arm/mach-tegra/tegra30_clocks_data.c
+++ b/trunk/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,