diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
| commit | 905ec87e93bc9e01b15c60035cd6a50c636cbaef (patch) | |
| tree | 46fd7618d6511611ffc19eb0dd4d7bc6b90a41c2 /arch/i386/kernel/time.c | |
| parent | 1d6ae775d7a948c9575658eb41184fd2e506c0df (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/i386/kernel/time.c')
| -rw-r--r-- | arch/i386/kernel/time.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c index eefea7c55008..2883a4d4f01f 100644 --- a/arch/i386/kernel/time.c +++ b/arch/i386/kernel/time.c | |||
| @@ -329,8 +329,7 @@ EXPORT_SYMBOL(get_cmos_time); | |||
| 329 | 329 | ||
| 330 | static void sync_cmos_clock(unsigned long dummy); | 330 | static void sync_cmos_clock(unsigned long dummy); |
| 331 | 331 | ||
| 332 | static struct timer_list sync_cmos_timer = | 332 | static DEFINE_TIMER(sync_cmos_timer, sync_cmos_clock, 0, 0); |
| 333 | TIMER_INITIALIZER(sync_cmos_clock, 0, 0); | ||
| 334 | 333 | ||
| 335 | static void sync_cmos_clock(unsigned long dummy) | 334 | static void sync_cmos_clock(unsigned long dummy) |
| 336 | { | 335 | { |