summaryrefslogtreecommitdiffstats
path: root/include/asm-i386/timex.h
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2005-06-25 14:27:27 +0100
committerAnton Altaparmakov <aia21@cantab.net>2005-06-25 14:27:27 +0100
commit38b22b6e9f46ab8f73ef5734f0e0a000766a9258 (patch)
tree2ccc41ef55918d3af43e444bde7648562a031559 /include/asm-i386/timex.h
parent3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4 (diff)
parentb3e112bcc19abd8e9657dca34a87316786e096f3 (diff)
downloadop-kernel-dev-38b22b6e9f46ab8f73ef5734f0e0a000766a9258.zip
op-kernel-dev-38b22b6e9f46ab8f73ef5734f0e0a000766a9258.tar.gz
Automerge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'include/asm-i386/timex.h')
-rw-r--r--include/asm-i386/timex.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/asm-i386/timex.h b/include/asm-i386/timex.h
index b41e484..292b5a6 100644
--- a/include/asm-i386/timex.h
+++ b/include/asm-i386/timex.h
@@ -47,6 +47,9 @@ static inline cycles_t get_cycles (void)
return ret;
}
-extern unsigned long cpu_khz;
+extern unsigned int cpu_khz;
+
+extern int read_current_timer(unsigned long *timer_value);
+#define ARCH_HAS_READ_CURRENT_TIMER 1
#endif
OpenPOWER on IntegriCloud