summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Williams <scwilliams@nvidia.com>2011-06-09 13:28:03 -0700
committerNiket Sirsi <nsirsi@nvidia.com>2011-06-14 16:20:34 -0700
commite7f839a1a0d2c21b459aa6b99504ac7dbf676ca0 (patch)
tree5711e0901d3257b1e84902b5b4787edfb5ac9bdf
parent2aea6156a5b30b3a6720f2935da70ced0303198f (diff)
arm: tegra: power: Fix incorrect use of CONFIG_HOTPLUG
CONFIG_HOTPLUG was inadvertantly used where CONFIG_HOTPLUG_CPU should have been used. Change-Id: Ibbc925b01ea64f1b2cfb86c215557357bf9c185a Reviewed-on: http://git-master/r/35942 Reviewed-by: Niket Sirsi <nsirsi@nvidia.com> Tested-by: Niket Sirsi <nsirsi@nvidia.com>
-rw-r--r--arch/arm/mach-tegra/common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c
index d19a97977708..03562f36be79 100644
--- a/arch/arm/mach-tegra/common.c
+++ b/arch/arm/mach-tegra/common.c
@@ -388,7 +388,7 @@ void __init tegra_cpu_reset_handler_init(void)
virt_to_phys((void*)cpu_present_mask);
__tegra_cpu_reset_handler_data[TEGRA_RESET_STARTUP_SECONDARY] =
virt_to_phys((void*)tegra_secondary_startup);
-#ifdef CONFIG_HOTPLUG
+#ifdef CONFIG_HOTPLUG_CPU
__tegra_cpu_reset_handler_data[TEGRA_RESET_MASK_ONLINE_PTR] =
virt_to_phys((void*)cpu_online_mask);
__tegra_cpu_reset_handler_data[TEGRA_RESET_STARTUP_HOTPLUG] =