diff options
| author | Scott Williams <scwilliams@nvidia.com> | 2011-07-19 15:06:21 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:46:49 -0800 |
| commit | a97fd4ec641a6be191f90bcdd919c2e349d6dd3b (patch) | |
| tree | 0c68fdeb8248135d960f1af5d3836b26b67f9c99 /arch/arm/mach-tegra/headsmp.S | |
| parent | f9abb004a325fe2620d5db39a59389d918ab3d63 (diff) | |
ARM: tegra: Clean up headsmp.S #ifdefs
Should be functionally identical
Change-Id: Ib22b0bf3f529b32fcaec51f42f61a01aba45eec4
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Rebase-Id: Ra2a76d338caaed07ada1e24002cefe2bcf643bd2
Diffstat (limited to 'arch/arm/mach-tegra/headsmp.S')
| -rw-r--r-- | arch/arm/mach-tegra/headsmp.S | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/headsmp.S b/arch/arm/mach-tegra/headsmp.S index 73d270c51bdd..c30e57cbcdef 100644 --- a/arch/arm/mach-tegra/headsmp.S +++ b/arch/arm/mach-tegra/headsmp.S @@ -3,7 +3,7 @@ * * SMP initialization routines for Tegra SoCs * - * Copyright (c) 2009-2010, NVIDIA Corporation. + * Copyright (c) 2009-2011, NVIDIA Corporation. * Copyright (c) 2011 Google, Inc. * Author: Colin Cross <ccross@android.com> * Gary King <gking@nvidia.com> @@ -36,7 +36,6 @@ * Initial secondary processor boot vector; jumps to kernel's * secondary_startup routine */ -#ifdef CONFIG_SMP ENTRY(tegra_secondary_startup) bl tegra_invalidate_l1 bl tegra_enable_coresite @@ -45,6 +44,7 @@ ENDPROC(tegra_secondary_startup) #endif #ifdef CONFIG_PM_SLEEP +#ifdef CONFIG_SMP /* * tegra_secondary_resume * @@ -56,9 +56,7 @@ ENTRY(tegra_secondary_resume) b cpu_resume ENDPROC(tegra_secondary_resume) #endif -#endif -#ifdef CONFIG_PM_SLEEP /* * tegra_resume * |