diff --git a/[refs] b/[refs] index 3c8b794bf019..17ef56401dde 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7285dd7fd375763bfb8ab1ac9cf3f1206f503c16 +refs/heads/master: e500011ffa191d662ac64d4ada6a5187b3180e16 diff --git a/trunk/include/linux/timer.h b/trunk/include/linux/timer.h index be62ec2ebea5..a2d1eb6cb3f0 100644 --- a/trunk/include/linux/timer.h +++ b/trunk/include/linux/timer.h @@ -173,11 +173,6 @@ extern int mod_timer_pinned(struct timer_list *timer, unsigned long expires); */ #define NEXT_TIMER_MAX_DELTA ((1UL << 30) - 1) -/* - * Return when the next timer-wheel timeout occurs (in absolute jiffies), - * locks the timer base: - */ -extern unsigned long next_timer_interrupt(void); /* * Return when the next timer-wheel timeout occurs (in absolute jiffies), * locks the timer base and does the comparison against the given