summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRabin Vincent <rabin.vincent@stericsson.com>2011-10-26 12:51:37 +0530
committerLinus WALLEIJ <linus.walleij@stericsson.com>2011-10-26 17:30:40 +0200
commit94160bce5ef05ea15d996b8c70b37148fc8ce4fe (patch)
tree04ef8f2937a64ca05fd13661863ef54a8bb61966
parent9c6d36871ef11e0974a57b6c06261917098e0e68 (diff)
ux500: pm: fix cpuidle debug config
CONFIG_U8500_CPUIDLE_DEBUG has been renamed to UX500. Fix the source file so that the code actually gets built. ST-Ericsson ID: 370028 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Id2c9019f2e319b9cebd92e268194e0652dbfd265 Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35275 Reviewed-by: QATOOLS Reviewed-by: QABUILD Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com>
-rw-r--r--arch/arm/mach-ux500/include/mach/pm-timer.h2
-rw-r--r--arch/arm/mach-ux500/pm/timer.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/include/mach/pm-timer.h b/arch/arm/mach-ux500/include/mach/pm-timer.h
index ec9e919e70d..f5fafbbaa77 100644
--- a/arch/arm/mach-ux500/include/mach/pm-timer.h
+++ b/arch/arm/mach-ux500/include/mach/pm-timer.h
@@ -12,7 +12,7 @@
#include <linux/ktime.h>
-#ifdef CONFIG_U8500_CPUIDLE_DEBUG
+#ifdef CONFIG_UX500_CPUIDLE_DEBUG
ktime_t u8500_rtc_exit_latency_get(void);
void ux500_rtcrtt_measure_latency(bool enable);
#else
diff --git a/arch/arm/mach-ux500/pm/timer.c b/arch/arm/mach-ux500/pm/timer.c
index 79652a6af23..b4b16073915 100644
--- a/arch/arm/mach-ux500/pm/timer.c
+++ b/arch/arm/mach-ux500/pm/timer.c
@@ -72,7 +72,7 @@
static void __iomem *rtc_base;
static bool measure_latency;
-#ifdef CONFIG_U8500_CPUIDLE_DEBUG
+#ifdef CONFIG_UX500_CPUIDLE_DEBUG
/*
* The plan here is to be able to measure the ApSleep/ApDeepSleep exit latency