From 39de34a01053ee070a507cf8580105ca5538967a Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Wed, 23 Feb 2011 11:58:50 -0700 Subject: [PATCH] --- yaml --- r: 235271 b: refs/heads/master c: ddb7d5d80edb58e8235f1bc6c350eac40bfe85d1 h: refs/heads/master i: 235269: 617182e4a76aec42fa21fcd146e716e0376622ad 235267: 6742d3f154d42d2641bf89b92d188893d18026f0 235263: 9cf0338fb99d8b5ea082ccb9391e02cada9300f3 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-tegra/tegra2_clocks.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 094592e6a8dd..38687b1697e6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c106bf5b3e59e1fc8e0dfcd7a620cfed7a98430 +refs/heads/master: ddb7d5d80edb58e8235f1bc6c350eac40bfe85d1 diff --git a/trunk/arch/arm/mach-tegra/tegra2_clocks.c b/trunk/arch/arm/mach-tegra/tegra2_clocks.c index ee3f9d76dcb2..6d7c4eea4dcb 100644 --- a/trunk/arch/arm/mach-tegra/tegra2_clocks.c +++ b/trunk/arch/arm/mach-tegra/tegra2_clocks.c @@ -1823,8 +1823,8 @@ static struct clk tegra_clk_d = { }; /* dap_mclk1, belongs to the cdev1 pingroup. */ -static struct clk tegra_dev1_clk = { - .name = "clk_dev1", +static struct clk tegra_clk_cdev1 = { + .name = "cdev1", .ops = &tegra_cdev_clk_ops, .rate = 26000000, .max_rate = 26000000, @@ -1834,8 +1834,8 @@ static struct clk tegra_dev1_clk = { }; /* dap_mclk2, belongs to the cdev2 pingroup. */ -static struct clk tegra_dev2_clk = { - .name = "clk_dev2", +static struct clk tegra_clk_cdev2 = { + .name = "cdev2", .ops = &tegra_cdev_clk_ops, .rate = 26000000, .max_rate = 26000000, @@ -2276,8 +2276,8 @@ struct clk *tegra_ptr_clks[] = { &tegra_clk_hclk, &tegra_clk_pclk, &tegra_clk_d, - &tegra_dev1_clk, - &tegra_dev2_clk, + &tegra_clk_cdev1, + &tegra_clk_cdev2, &tegra_clk_virtual_cpu, &tegra_clk_blink, &tegra_clk_cop,