diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
| commit | dcec8a13bf565e47942a1751a9cec21bec5648fe (patch) | |
| tree | 548b69625b18cc2e88c3e68d0923be546c9ebb03 /include/asm-sparc/timer.h | |
| parent | 2e0f55e79c49509b7ff70ff1a10e1e9e90a3dfd4 (diff) | |
o Merge with Linux 2.1.99.
o Fix ancient bug in the ELF loader making ldd crash.
o Fix ancient bug in the keyboard code for SGI, SNI and Jazz.
Diffstat (limited to 'include/asm-sparc/timer.h')
| -rw-r--r-- | include/asm-sparc/timer.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/include/asm-sparc/timer.h b/include/asm-sparc/timer.h index 9dcd84dec..91add4f49 100644 --- a/include/asm-sparc/timer.h +++ b/include/asm-sparc/timer.h @@ -1,12 +1,16 @@ -/* $Id: timer.h,v 1.15 1997/12/18 14:21:43 jj Exp $ +/* $Id: timer.h,v 1.16 1998/01/30 10:59:59 jj Exp $ * timer.h: Definitions for the timer chips on the Sparc. * * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) */ + +#include <linux/config.h> + #ifndef _SPARC_TIMER_H #define _SPARC_TIMER_H #include <asm/system.h> /* For NCPUS */ +#include <asm/sun4paddr.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. @@ -31,6 +35,11 @@ struct sun4c_timer_info { }; #define SUN4C_TIMER_PHYSADDR 0xf3000000 +#ifdef CONFIG_SUN4 +#define SUN_TIMER_PHYSADDR SUN4_300_TIMER_PHYSADDR +#else +#define SUN_TIMER_PHYSADDR SUN4C_TIMER_PHYSADDR +#endif /* A sun4m has two blocks of registers which are probably of the same * structure. LSI Logic's L64851 is told to _decrement_ from the limit |