diff options
-rw-r--r-- | arch/mips/dec/time.c | 1 | ||||
-rw-r--r-- | arch/mips/kernel/time.c | 2 | ||||
-rw-r--r-- | include/asm-mips/time.h | 9 |
3 files changed, 1 insertions, 11 deletions
diff --git a/arch/mips/dec/time.c b/arch/mips/dec/time.c index 820e5331205f..60349062595a 100644 --- a/arch/mips/dec/time.c +++ b/arch/mips/dec/time.c | |||
@@ -161,7 +161,6 @@ static cycle_t dec_ioasic_hpt_read(void) | |||
161 | 161 | ||
162 | void __init plat_time_init(void) | 162 | void __init plat_time_init(void) |
163 | { | 163 | { |
164 | mips_timer_state = dec_timer_state; | ||
165 | mips_timer_ack = dec_timer_ack; | 164 | mips_timer_ack = dec_timer_ack; |
166 | 165 | ||
167 | if (!cpu_has_counter && IOASIC) | 166 | if (!cpu_has_counter && IOASIC) |
diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c index 2995be1ab3ca..9f85d4cecc5b 100644 --- a/arch/mips/kernel/time.c +++ b/arch/mips/kernel/time.c | |||
@@ -50,8 +50,6 @@ int update_persistent_clock(struct timespec now) | |||
50 | return rtc_mips_set_mmss(now.tv_sec); | 50 | return rtc_mips_set_mmss(now.tv_sec); |
51 | } | 51 | } |
52 | 52 | ||
53 | int (*mips_timer_state)(void); | ||
54 | |||
55 | int null_perf_irq(void) | 53 | int null_perf_irq(void) |
56 | { | 54 | { |
57 | return 0; | 55 | return 0; |
diff --git a/include/asm-mips/time.h b/include/asm-mips/time.h index 7717934f94c3..a8fd16e1981f 100644 --- a/include/asm-mips/time.h +++ b/include/asm-mips/time.h | |||
@@ -31,20 +31,13 @@ extern int rtc_mips_set_time(unsigned long); | |||
31 | extern int rtc_mips_set_mmss(unsigned long); | 31 | extern int rtc_mips_set_mmss(unsigned long); |
32 | 32 | ||
33 | /* | 33 | /* |
34 | * Timer interrupt functions. | ||
35 | * mips_timer_state is needed for high precision timer calibration. | ||
36 | */ | ||
37 | extern int (*mips_timer_state)(void); | ||
38 | |||
39 | /* | ||
40 | * board specific routines required by time_init(). | 34 | * board specific routines required by time_init(). |
41 | */ | 35 | */ |
42 | extern void plat_time_init(void); | 36 | extern void plat_time_init(void); |
43 | 37 | ||
44 | /* | 38 | /* |
45 | * mips_hpt_frequency - must be set if you intend to use an R4k-compatible | 39 | * mips_hpt_frequency - must be set if you intend to use an R4k-compatible |
46 | * counter as a timer interrupt source; otherwise it can be set up | 40 | * counter as a timer interrupt source. |
47 | * automagically with an aid of mips_timer_state. | ||
48 | */ | 41 | */ |
49 | extern unsigned int mips_hpt_frequency; | 42 | extern unsigned int mips_hpt_frequency; |
50 | 43 | ||