diff options
| author | Miguel de Icaza <miguel@nuclecu.unam.mx> | 1997-08-06 19:14:48 +0000 |
|---|---|---|
| committer | Miguel de Icaza <miguel@nuclecu.unam.mx> | 1997-08-06 19:14:48 +0000 |
| commit | e2819e52a162873ff5061de81bb749831bdb5de9 (patch) | |
| tree | 6067ea700202750ba335a423696f2972700e5f76 /drivers/sbus/sbus.c | |
| parent | 17a005074429bbf143e40401f405ae4363e56828 (diff) | |
Merge to 2.1.38.
IMPORTANT NOTE: I could not figure out what information is the
one that should be used for the following files (ie, those
that were in our tree, or those that came from Linus' patch),
please, check these:
include/asm-mips/jazz.h
include/asm-mips/jazzdma.h
include/asm-mips/ioctls.h
Diffstat (limited to 'drivers/sbus/sbus.c')
| -rw-r--r-- | drivers/sbus/sbus.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/sbus/sbus.c b/drivers/sbus/sbus.c index 4d59647cc..cf06585ff 100644 --- a/drivers/sbus/sbus.c +++ b/drivers/sbus/sbus.c @@ -385,5 +385,12 @@ sbus_init(unsigned long memory_start, unsigned long memory_end)) if (sparc_cpu_model == sun4u) auxio_probe (); #endif +#ifdef __sparc_v9__ + if (sparc_cpu_model == sun4u) { + extern void sun4u_start_timers(void); + + sun4u_start_timers(); + } +#endif return memory_start; } |