diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-10-05 02:41:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-10-05 02:41:37 -0700 |
| commit | 044836d4931f93520ab7331d9d92ca80eda9b3ea (patch) | |
| tree | 0b741e59350d491576440b05cc57580b489ff4b5 /include | |
| parent | 7e5829c1f7c443d710aec2e31f96c2c7a3856846 (diff) | |
| parent | ee206dc5659be5df14a48a3e031c6dbe6faf5f0a (diff) | |
Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/mach/time.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/asm-arm/mach/time.h b/include/asm-arm/mach/time.h index edb6fcc6a200..51728edf7ba4 100644 --- a/include/asm-arm/mach/time.h +++ b/include/asm-arm/mach/time.h @@ -13,8 +13,11 @@ extern void (*init_arch_time)(void); extern int (*set_rtc)(void); -extern unsigned long(*gettimeoffset)(void); +extern unsigned long (*gettimeoffset)(void); -void timer_tick(struct pt_regs *); +extern void timer_tick(struct pt_regs *); + +extern void save_time_delta(struct timespec *delta, struct timespec *rtc); +extern void restore_time_delta(struct timespec *delta, struct timespec *rtc); #endif |