diff options
| author | Greg KH <gregkh@suse.de> | 2005-09-12 15:10:59 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-12 15:10:59 -0400 |
| commit | ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489 (patch) | |
| tree | 5571f6a5784f51efddf9c1ee0408894cd63a460f /net/sched/sch_api.c | |
| parent | 6b7839007098a6b5612d31690e11277d4242e6ae (diff) | |
| parent | 2ade81473636b33aaac64495f89a7dc572c529f0 (diff) | |
Merge ../torvalds-2.6/
Diffstat (limited to 'net/sched/sch_api.c')
| -rw-r--r-- | net/sched/sch_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index 737681cb9a92..31570b9a6e9a 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c | |||
| @@ -1194,7 +1194,7 @@ EXPORT_SYMBOL(psched_time_base); | |||
| 1194 | * with 32-bit get_cycles(). Safe up to 4GHz CPU. | 1194 | * with 32-bit get_cycles(). Safe up to 4GHz CPU. |
| 1195 | */ | 1195 | */ |
| 1196 | static void psched_tick(unsigned long); | 1196 | static void psched_tick(unsigned long); |
| 1197 | static struct timer_list psched_timer = TIMER_INITIALIZER(psched_tick, 0, 0); | 1197 | static DEFINE_TIMER(psched_timer, psched_tick, 0, 0); |
| 1198 | 1198 | ||
| 1199 | static void psched_tick(unsigned long dummy) | 1199 | static void psched_tick(unsigned long dummy) |
| 1200 | { | 1200 | { |