diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-09 09:44:07 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-09 09:44:07 -0400 |
| commit | f58f8be7f65312f602f7970e7da47a6413e692b0 (patch) | |
| tree | f60cc040deebceea1b44082dc713e95687d8527f /arch/sparc/kernel/time.c | |
| parent | c71c18576d0d8aa4db876c737c3c597c724cf02f (diff) | |
| parent | e710245bb0f980adfb1dfe850e43761a8117c6be (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'arch/sparc/kernel/time.c')
| -rw-r--r-- | arch/sparc/kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c index bc015e980341..279a62627c10 100644 --- a/arch/sparc/kernel/time.c +++ b/arch/sparc/kernel/time.c | |||
| @@ -457,7 +457,7 @@ void __init time_init(void) | |||
| 457 | sbus_time_init(); | 457 | sbus_time_init(); |
| 458 | } | 458 | } |
| 459 | 459 | ||
| 460 | extern __inline__ unsigned long do_gettimeoffset(void) | 460 | static inline unsigned long do_gettimeoffset(void) |
| 461 | { | 461 | { |
| 462 | return (*master_l10_counter >> 10) & 0x1fffff; | 462 | return (*master_l10_counter >> 10) & 0x1fffff; |
| 463 | } | 463 | } |