From a3fc494a4f504034248c1879e7396ca47eda11e1 Mon Sep 17 00:00:00 2001 From: Yong Zhang Date: Sun, 24 Oct 2010 11:50:53 +0800 Subject: [PATCH] --- yaml --- r: 224027 b: refs/heads/master c: 5e4f083f78d03e9f8d2e327daccde16976f9bb00 h: refs/heads/master i: 224025: 3387363f9a3ac855e70814b8f022f0d9d8b8e059 224023: fde0763a1c2ac03168b66e81091c69662ed5b570 v: v3 --- [refs] | 2 +- trunk/include/linux/hrtimer.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 33b60249f2c9..7c795b8fa0b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 466bd3030973910118ca601da8072be97a1e2209 +refs/heads/master: 5e4f083f78d03e9f8d2e327daccde16976f9bb00 diff --git a/trunk/include/linux/hrtimer.h b/trunk/include/linux/hrtimer.h index fd0c1b857d3d..dd9954b79342 100644 --- a/trunk/include/linux/hrtimer.h +++ b/trunk/include/linux/hrtimer.h @@ -158,7 +158,6 @@ struct hrtimer_clock_base { * @lock: lock protecting the base and associated clock bases * and timers * @clock_base: array of clock bases for this cpu - * @curr_timer: the timer which is executing a callback right now * @expires_next: absolute time of the next event which was scheduled * via clock_set_next_event() * @hres_active: State of high resolution mode