diff options
| author | Scott Williams <scwilliams@nvidia.com> | 2011-07-21 13:55:08 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:46:50 -0800 |
| commit | 7c0a5100301534c004146240fb06566045f1637d (patch) | |
| tree | 2aeab9b283d629c1c018cc8efabcf4a66cb3e4e2 | |
| parent | b0450c40f360c78bafdc26b5fe63bc0b9b6c4345 (diff) | |
ARM: tegra2: Fix CONFIG_HOTPLUG_CPU dependencies
Change-Id: I54fab1134f2c51337da6f7b2ccc5ab304b600dea
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Rebase-Id: R45b2521f5d574774f1db13f6ef9ade5c116da9b4
| -rw-r--r-- | arch/arm/mach-tegra/sleep-t2.S | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/sleep-t2.S b/arch/arm/mach-tegra/sleep-t2.S index 3e60064a3927..271b188448a6 100644 --- a/arch/arm/mach-tegra/sleep-t2.S +++ b/arch/arm/mach-tegra/sleep-t2.S @@ -71,6 +71,7 @@ #define TEGRA_ARM_PERIF_VIRT (TEGRA_ARM_PERIF_BASE - IO_CPU_PHYS + IO_CPU_VIRT) #define TEGRA_CLK_RESET_VIRT (TEGRA_CLK_RESET_BASE - IO_PPSB_PHYS + IO_PPSB_VIRT) +#ifdef CONFIG_HOTPLUG_CPU /* * tegra2_sleep_reset(void) * @@ -97,8 +98,9 @@ ENTRY(tegra2_sleep_reset) bl tegra2_cpu_reset mov pc, lr ENDPROC(tegra2_sleep_reset) +#endif -#if defined(CONFIG_PM_SLEEP) +#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_PM_SLEEP) /* * tegra2_cpu_reset(int cpu) * @@ -139,7 +141,9 @@ ENTRY(tegra2_cpu_reset) beq . mov pc, lr ENDPROC(tegra2_cpu_reset) +#endif +#ifdef CONFIG_PM_SLEEP /* * tegra2_cpu_set_resettable_soon(void) * |