diff options
author | Scott Williams <scwilliams@nvidia.com> | 2011-07-21 13:29:11 -0700 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:46:50 -0800 |
commit | ab28f2bf97c63303879f52056824f47bfe1eca94 (patch) | |
tree | ef89af222a33094cc013a938ddc99c64948629d7 /arch/arm/mach-tegra/sleep-t2.S | |
parent | 8e34fb96d17f73e807f41c3160aa3c1770ea6a1d (diff) |
ARM: tegra: Always compile sleep.S
Decouple LP3 (WFI) mode and CPU hotplug shutdown from CONFIG_PM_SLEEP.
Change-Id: Ie959fa5e044ab4a7f84772d3b743ce2680465acc
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Rebase-Id: R8f01e646e7bf65350db44557de87c4c2a33d8059
Diffstat (limited to 'arch/arm/mach-tegra/sleep-t2.S')
-rw-r--r-- | arch/arm/mach-tegra/sleep-t2.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/sleep-t2.S b/arch/arm/mach-tegra/sleep-t2.S index e683680384d6..8dc0f363caac 100644 --- a/arch/arm/mach-tegra/sleep-t2.S +++ b/arch/arm/mach-tegra/sleep-t2.S @@ -98,6 +98,7 @@ ENTRY(tegra2_sleep_reset) mov pc, lr ENDPROC(tegra2_sleep_reset) +#if defined(CONFIG_PM_SLEEP) /* * tegra2_cpu_reset(int cpu) * @@ -533,3 +534,4 @@ tegra2_sdram_pad_save: .globl tegra2_iram_end tegra2_iram_end: b . +#endif |