diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
commit | 78c388aed2b7184182c08428db1de6c872d815f5 (patch) | |
tree | 4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /include/asm-sparc/timer.h | |
parent | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff) |
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'include/asm-sparc/timer.h')
-rw-r--r-- | include/asm-sparc/timer.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/asm-sparc/timer.h b/include/asm-sparc/timer.h index f1b41f7e4..843ff4b7c 100644 --- a/include/asm-sparc/timer.h +++ b/include/asm-sparc/timer.h @@ -1,4 +1,4 @@ -/* $Id: timer.h,v 1.17 1998/04/24 12:30:19 davem Exp $ +/* $Id: timer.h,v 1.20 1998/09/21 05:07:37 jj Exp $ * timer.h: Definitions for the timer chips on the Sparc. * * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) @@ -11,6 +11,7 @@ #include <asm/system.h> /* For NCPUS */ #include <asm/sun4paddr.h> +#include <asm/btfixup.h> /* Timer structures. The interrupt timer has two properties which * are the counter (which is handled in do_timer in sched.c) and the limit. @@ -102,4 +103,8 @@ extern struct sun4d_timer_regs *sun4d_timers; extern __volatile__ unsigned int *master_l10_counter; extern __volatile__ unsigned int *master_l10_limit; +/* FIXME: Make do_[gs]ettimeofday btfixup calls */ +BTFIXUPDEF_CALL(void, bus_do_settimeofday, struct timeval *tv) +#define bus_do_settimeofday(tv) BTFIXUP_CALL(bus_do_settimeofday)(tv) + #endif /* !(_SPARC_TIMER_H) */ |