From 1470af81bb87457fdb3980d526b972c1dba7c797 Mon Sep 17 00:00:00 2001 From: Li Zefan Date: Sun, 3 Feb 2008 16:20:13 +0200 Subject: [PATCH] --- yaml --- r: 82755 b: refs/heads/master c: ef08cce81d9be38063ec7796e36f2b32bdf82ff2 h: refs/heads/master i: 82753: 8d0087117a9a52b335bd072d984f6e025149621a 82751: f2c04f17ce122fd675cf59e05b091383ee49bfbd v: v3 --- [refs] | 2 +- trunk/include/asm-x86/mach-voyager/do_timer.h | 1 - trunk/include/linux/hrtimer.h | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a196252b7ac4..7b08f91b706f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e01e00e768ef42fb5b8804cd1b9b47b26d59ec5 +refs/heads/master: ef08cce81d9be38063ec7796e36f2b32bdf82ff2 diff --git a/trunk/include/asm-x86/mach-voyager/do_timer.h b/trunk/include/asm-x86/mach-voyager/do_timer.h index bc2b58926308..9e5a459fd15b 100644 --- a/trunk/include/asm-x86/mach-voyager/do_timer.h +++ b/trunk/include/asm-x86/mach-voyager/do_timer.h @@ -6,7 +6,6 @@ /** * do_timer_interrupt_hook - hook into timer tick - * @regs: standard registers from interrupt * * Call the pit clock event handler. see asm/i8253.h **/ diff --git a/trunk/include/linux/hrtimer.h b/trunk/include/linux/hrtimer.h index 49067f14fac1..f79dcba4b2c1 100644 --- a/trunk/include/linux/hrtimer.h +++ b/trunk/include/linux/hrtimer.h @@ -147,7 +147,6 @@ struct hrtimer_sleeper { * @get_time: function to retrieve the current time of the clock * @get_softirq_time: function to retrieve the current time from the softirq * @softirq_time: the time when running the hrtimer queue in the softirq - * @cb_pending: list of timers where the callback is pending * @offset: offset of this clock to the monotonic base * @reprogram: function to reprogram the timer event */