diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-04 11:11:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-04 11:11:13 -0400 |
| commit | 43d0b1376dc7abc29411fa31f50fe7cfb68afcd3 (patch) | |
| tree | 67dc7b09f7c090a3b1360a6fb06fbf9342047c5c /arch/sparc/kernel/time.c | |
| parent | 832f8f0378ff1566f2a222352c7ad5df3f8d0d9d (diff) | |
| parent | fdc657c66678551c7987dc23a78ae1a26251276f (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
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 | } |