diff options
| author | Stephen Warren <swarren@nvidia.com> | 2012-09-14 21:34:53 +0400 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2012-09-14 21:34:53 +0400 |
| commit | f49540d1d7e90dc9864d96ad5a505d7feb8efbcc (patch) | |
| tree | 68519c0aebe74b333ee882e2b8b20583eb34fd45 /arch/arm/mach-tegra/include | |
| parent | 1f10478cabacf55f87be5ed4440d07378f19c237 (diff) | |
| parent | b4350f40f73b75efdceae3d9e04266979acabd8c (diff) | |
| download | linux-f49540d1d7e90dc9864d96ad5a505d7feb8efbcc.tar.xz | |
Merge branch 'for-3.7/common-clk' into for-3.7/cleanup2
Diffstat (limited to 'arch/arm/mach-tegra/include')
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/clk.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/include/mach/clk.h b/arch/arm/mach-tegra/include/mach/clk.h index d97e403303a0..95f3a547c770 100644 --- a/arch/arm/mach-tegra/include/mach/clk.h +++ b/arch/arm/mach-tegra/include/mach/clk.h @@ -34,7 +34,10 @@ enum tegra_clk_ex_param { void tegra_periph_reset_deassert(struct clk *c); void tegra_periph_reset_assert(struct clk *c); +#ifndef CONFIG_COMMON_CLK unsigned long clk_get_rate_all_locked(struct clk *c); +#endif + void tegra2_sdmmc_tap_delay(struct clk *c, int delay); int tegra_clk_cfg_ex(struct clk *c, enum tegra_clk_ex_param p, u32 setting); |