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