From dc83ae1c1fed54ab4a117d88665e56bcb512fd6b Mon Sep 17 00:00:00 2001 From: Joseph Lo Date: Fri, 17 Aug 2012 14:54:10 +0800 Subject: [PATCH] --- yaml --- r: 326645 b: refs/heads/master c: 9c54db6d3973ad1e8063932a4b0c6f32488f3ba8 h: refs/heads/master i: 326643: 9a712f9c347c341eaa09e8f8336a65224980c2eb v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-tegra/tegra30_clocks.h | 2 +- trunk/arch/arm/mach-tegra/tegra30_clocks_data.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 99feb9a5f945..b2a62978d13e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b78c030cebdaf8da14b44a4454146a7919e763a8 +refs/heads/master: 9c54db6d3973ad1e8063932a4b0c6f32488f3ba8 diff --git a/trunk/arch/arm/mach-tegra/tegra30_clocks.h b/trunk/arch/arm/mach-tegra/tegra30_clocks.h index b08b8d9024a6..f2f88fef6b8b 100644 --- a/trunk/arch/arm/mach-tegra/tegra30_clocks.h +++ b/trunk/arch/arm/mach-tegra/tegra30_clocks.h @@ -28,7 +28,7 @@ extern struct clk_ops tegra30_plle_ops; extern struct clk_ops tegra_cml_clk_ops; extern struct clk_ops tegra_pciex_clk_ops; extern struct clk_ops tegra_sync_source_ops; -extern struct clk_ops tegra_audio_sync_clk_ops; +extern struct clk_ops tegra30_audio_sync_clk_ops; extern struct clk_ops tegra30_clk_double_ops; extern struct clk_ops tegra_clk_out_ops; extern struct clk_ops tegra30_super_ops; diff --git a/trunk/arch/arm/mach-tegra/tegra30_clocks_data.c b/trunk/arch/arm/mach-tegra/tegra30_clocks_data.c index 267350675a88..448a6df57ac9 100644 --- a/trunk/arch/arm/mach-tegra/tegra30_clocks_data.c +++ b/trunk/arch/arm/mach-tegra/tegra30_clocks_data.c @@ -520,7 +520,7 @@ static const char *mux_audio_sync_clk[] = { }; \ static struct clk tegra_##_name = { \ .name = #_name, \ - .ops = &tegra_audio_sync_clk_ops, \ + .ops = &tegra30_audio_sync_clk_ops, \ .hw = &tegra_##_name##_hw.hw, \ .parent_names = mux_audio_sync_clk, \ .parents = tegra_sync_source_list, \