diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:53:16 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:53:16 -0400 |
| commit | 9b610fda0df5d0f0b0c64242e37441ad1b384aac (patch) | |
| tree | 0ea14b15f2e6546f37fe18d8ac3dc83077ec0e55 /arch/mips/kernel/i8253.c | |
| parent | b8f8c3cf0a4ac0632ec3f0e15e9dc0c29de917af (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into timers/nohz
Diffstat (limited to 'arch/mips/kernel/i8253.c')
| -rw-r--r-- | arch/mips/kernel/i8253.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/i8253.c b/arch/mips/kernel/i8253.c index 38fa1a194bf4..b6ac55162b9a 100644 --- a/arch/mips/kernel/i8253.c +++ b/arch/mips/kernel/i8253.c | |||
| @@ -80,7 +80,7 @@ static int pit_next_event(unsigned long delta, struct clock_event_device *evt) | |||
| 80 | * registered. This mechanism replaces the previous #ifdef LOCAL_APIC - | 80 | * registered. This mechanism replaces the previous #ifdef LOCAL_APIC - |
| 81 | * !using_apic_timer decisions in do_timer_interrupt_hook() | 81 | * !using_apic_timer decisions in do_timer_interrupt_hook() |
| 82 | */ | 82 | */ |
| 83 | struct clock_event_device pit_clockevent = { | 83 | static struct clock_event_device pit_clockevent = { |
| 84 | .name = "pit", | 84 | .name = "pit", |
| 85 | .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, | 85 | .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, |
| 86 | .set_mode = init_pit_timer, | 86 | .set_mode = init_pit_timer, |