X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Ftimer.h;h=68fdc1dfe80a3d5a340957ac1ff4e8f4b428a500;hb=6ec920da09a91594581c6d1a8931e72792b73525;hp=5c1d9001402c60353d4a3358972efe0cb2b7a911;hpb=6ec56f51cd5fc5870298ad68aca946495a422c27;p=bertos.git

diff --git a/drv/timer.h b/drv/timer.h
index 5c1d9001..68fdc1df 100755
--- a/drv/timer.h
+++ b/drv/timer.h
@@ -15,6 +15,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.33  2007/06/07 14:35:12  batt
+ *#* Merge from project_ks.
+ *#*
  *#* Revision 1.32  2007/01/09 08:57:19  bernie
  *#* Remove excess parentheses.
  *#*
@@ -166,7 +169,7 @@ INLINE ticks_t timer_clock(void)
  * interrupt is disabled (DISABLE_INTS) or overridden by a
  * higher-priority or non-nesting interrupt.
  *
- * \sa timer_ticks
+ * \sa timer_clock
  */
 INLINE ticks_t timer_clock_unlocked(void)
 {