Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / include / asm-mips / time.h

diff --git a/include/asm-mips/time.h b/include/asm-mips/time.h
index 7717934f94c35122ba55e9a4830cbc91c1bcf216..a8fd16e1981f36fd7837835366cc412b32465506 100644 (file)
--- a/include/asm-mips/time.h
+++ b/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;