diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 05:51:24 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 05:51:24 -0500 |
| commit | 3b621ee5df437d3f332a635ab6421aaa61a7dc2b (patch) | |
| tree | c4a5236cee8eb7418770802313d36a55f1cc0b1e /include/asm-cris/arch-v32/timex.h | |
| parent | 7211bb9b64f17b23834d91fc3d0c1d78671ee9a8 (diff) | |
| parent | 5e04e7fe774794b837e1d3897e6b96ae2d06679a (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/asm-cris/arch-v32/timex.h')
| -rw-r--r-- | include/asm-cris/arch-v32/timex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-cris/arch-v32/timex.h b/include/asm-cris/arch-v32/timex.h index 4d0fd23b21e9..5a4aa285d5fd 100644 --- a/include/asm-cris/arch-v32/timex.h +++ b/include/asm-cris/arch-v32/timex.h | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | 22 | ||
| 23 | extern unsigned long get_ns_in_jiffie(void); | 23 | extern unsigned long get_ns_in_jiffie(void); |
| 24 | 24 | ||
| 25 | extern inline unsigned long get_us_in_jiffie_highres(void) | 25 | static inline unsigned long get_us_in_jiffie_highres(void) |
| 26 | { | 26 | { |
| 27 | return get_ns_in_jiffie() / 1000; | 27 | return get_ns_in_jiffie() / 1000; |
| 28 | } | 28 | } |