diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-03 21:43:24 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 13:45:36 -0700 |
| commit | 2268683075e741190919217a72fcf13eb174dc57 (patch) | |
| tree | 39b67231d4cd7ff046c2d8883fbeb1dca7fec8d2 /arch/arm/mach-tegra/platsmp.c | |
| parent | f2958225a6495f772696a44d8ec3b10ef6dc0153 (diff) | |
ARM: tegra: Use <linux/clk/tegra.h> instead of <mach/clk.h>
So that the upstream common clk infrastructure can live side by side.
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Change-Id: I0fe0ef8cd207d27b707821eed838c75b8ec04025
Diffstat (limited to 'arch/arm/mach-tegra/platsmp.c')
| -rw-r--r-- | arch/arm/mach-tegra/platsmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/platsmp.c b/arch/arm/mach-tegra/platsmp.c index f3227bd2f8ed..c3eed8443296 100644 --- a/arch/arm/mach-tegra/platsmp.c +++ b/arch/arm/mach-tegra/platsmp.c @@ -290,7 +290,7 @@ static int __cpuinit tegra_boot_secondary(unsigned int cpu, struct task_struct * - CPU mode switch is not allowed */ status = -EINVAL; } else { -#ifdef CONFIG_CPU_FREQ +#if defined(CONFIG_CPU_FREQ) && !defined(CONFIG_COMMON_CLK) /* set cpu rate is within g-mode range before switch */ unsigned int speed = max( (unsigned long)tegra_getspeed(0), |