From ebba095827b174ffd86a5f86290a12672289a620 Mon Sep 17 00:00:00 2001
From: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Date: Sun, 9 Dec 2007 21:19:36 +0900
Subject: [PATCH] --- yaml --- r: 78048 b: refs/heads/master c:
 c9662341f8a09cffd7234a89cc066c342fe343bf h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/arch/mips/dec/time.c    | 1 -
 trunk/arch/mips/kernel/time.c | 2 --
 trunk/include/asm-mips/time.h | 9 +--------
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index ccee771da3e1..ca3877799d18 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa71c96002d1b02cd1ba1a4477d4b8ad95b587f9
+refs/heads/master: c9662341f8a09cffd7234a89cc066c342fe343bf
diff --git a/trunk/arch/mips/dec/time.c b/trunk/arch/mips/dec/time.c
index 820e5331205f..60349062595a 100644
--- a/trunk/arch/mips/dec/time.c
+++ b/trunk/arch/mips/dec/time.c
@@ -161,7 +161,6 @@ static cycle_t dec_ioasic_hpt_read(void)
 
 void __init plat_time_init(void)
 {
-	mips_timer_state = dec_timer_state;
 	mips_timer_ack = dec_timer_ack;
 
 	if (!cpu_has_counter && IOASIC)
diff --git a/trunk/arch/mips/kernel/time.c b/trunk/arch/mips/kernel/time.c
index 2995be1ab3ca..9f85d4cecc5b 100644
--- a/trunk/arch/mips/kernel/time.c
+++ b/trunk/arch/mips/kernel/time.c
@@ -50,8 +50,6 @@ int update_persistent_clock(struct timespec now)
 	return rtc_mips_set_mmss(now.tv_sec);
 }
 
-int (*mips_timer_state)(void);
-
 int null_perf_irq(void)
 {
 	return 0;
diff --git a/trunk/include/asm-mips/time.h b/trunk/include/asm-mips/time.h
index 7717934f94c3..a8fd16e1981f 100644
--- a/trunk/include/asm-mips/time.h
+++ b/trunk/include/asm-mips/time.h
@@ -30,12 +30,6 @@ extern spinlock_t rtc_lock;
 extern int rtc_mips_set_time(unsigned long);
 extern int rtc_mips_set_mmss(unsigned long);
 
-/*
- * Timer interrupt functions.
- * mips_timer_state is needed for high precision timer calibration.
- */
-extern int (*mips_timer_state)(void);
-
 /*
  * board specific routines required by time_init().
  */
@@ -43,8 +37,7 @@ extern void plat_time_init(void);
 
 /*
  * mips_hpt_frequency - must be set if you intend to use an R4k-compatible
- * counter as a timer interrupt source; otherwise it can be set up
- * automagically with an aid of mips_timer_state.
+ * counter as a timer interrupt source.
  */
 extern unsigned int mips_hpt_frequency;