diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-09 10:33:02 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-09 10:33:02 -0400 |
| commit | 9dc263239bb2cfeb242d8ef758fca66a968822d5 (patch) | |
| tree | 70c0c46fa6f01740c776ae24bc0874a8d97df222 /arch/sparc/kernel/time.c | |
| parent | 0e5dec478cfff2c29e68d1108ff828fa321adc59 (diff) | |
| parent | 829841146878e082613a49581ae252c071057c23 (diff) | |
Merge branch 'master'
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 | } |