Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[deliverable/linux.git] / kernel / time / alarmtimer.c

diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
index e840ed867a5d9406e26a8bc13f3e635b0d66cbdd..c3aad685bbc036cc2f03672085aedd9dc9c8fb86 100644 (file)
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -30,7 +30,6 @@
  * struct alarm_base - Alarm timer bases
  * @lock:              Lock for syncrhonized access to the base
  * @timerqueue:                Timerqueue head managing the list of events
- * @timer:             hrtimer used to schedule events while running
  * @gettime:           Function to read the time correlating to the base
  * @base_clockid:      clockid for the base
  */