git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
[pandora-kernel.git]
/
include
/
linux
/
timex.h
diff --git
a/include/linux/timex.h
b/include/linux/timex.h
index
24c6a2b
..
8ea3e71
100644
(file)
--- a/
include/linux/timex.h
+++ b/
include/linux/timex.h
@@
-244,6
+244,8
@@
extern int do_adjtimex(struct timex *);
/* Don't use! Compatibility define for existing users. */
#define tickadj (500/HZ ? : 1)
+int read_current_timer(unsigned long *timer_val);
+
#endif /* KERNEL */
#endif /* LINUX_TIMEX_H */