Merge branch 'linus' into sched/core

[mv-sheeva.git] / include / linux / timex.h

diff --git a/include/linux/timex.h b/include/linux/timex.h
index 94f8faecdcbc75bc9a10ffc9fb2a97465480b76e..7a082b32d8e13ac98fe5b04b962f2f44a4f9ecc7 100644 (file)
--- a/include/linux/timex.h
+++ b/include/linux/timex.h
@@ -238,9 +238,6 @@ extern int tickadj;                 /* amount of adjustment per tick */
  * phase-lock loop variables
  */
 extern int time_status;                /* clock synchronization status bits */
-extern long time_maxerror;     /* maximum error */
-extern long time_esterror;     /* estimated error */
-
 extern long time_adjust;       /* The amount of adjtime left */
 
 extern void ntp_init(void);