From e7f839a1a0d2c21b459aa6b99504ac7dbf676ca0 Mon Sep 17 00:00:00 2001 From: Scott Williams Date: Thu, 9 Jun 2011 13:28:03 -0700 Subject: 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 Tested-by: Niket Sirsi --- arch/arm/mach-tegra/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm') 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] = -- cgit v1.2.3