From 53495fbcf1ba9dcd8e38a5af92c9d21c1e517c29 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 25 May 2011 23:08:17 +0200
Subject: [PATCH] --- yaml --- r: 251337 b: refs/heads/master c:
 90ff1f30c0f401e325d6b2747618b7e3a0addaf8 h: refs/heads/master i:   251335:
 c35ac5d083f0467c6ef4f7595d977e7c0a98ddc9 v: v3

---
 [refs]                 | 2 +-
 trunk/kernel/hrtimer.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 250faff3ea81..a4d799d9759a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51b550a41c2ac0373b42f4e211f2df113b735b0a
+refs/heads/master: 90ff1f30c0f401e325d6b2747618b7e3a0addaf8
diff --git a/trunk/kernel/hrtimer.c b/trunk/kernel/hrtimer.c
index c541ee527ecb..a9205e32a059 100644
--- a/trunk/kernel/hrtimer.c
+++ b/trunk/kernel/hrtimer.c
@@ -748,7 +748,7 @@ static inline void retrigger_next_event(void *arg) { }
  */
 void clock_was_set(void)
 {
-#ifdef CONFIG_HIGHRES_TIMERS
+#ifdef CONFIG_HIGH_RES_TIMERS
 	/* Retrigger the CPU local events everywhere */
 	on_each_cpu(retrigger_next_event, NULL, 1);
 #endif