diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-19 01:28:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-19 01:28:40 +0000 |
| commit | 8abb719409c9060a7c0676f76e9182c1e0b8ca46 (patch) | |
| tree | b88cc5a6cd513a04a512b7e6215c873c90a1c5dd /include/asm-arm/arch-ebsa285 | |
| parent | f01bd7aeafd95a08aafc9e3636bb26974df69d82 (diff) | |
Merge with 2.3.99-pre1.
Diffstat (limited to 'include/asm-arm/arch-ebsa285')
| -rw-r--r-- | include/asm-arm/arch-ebsa285/time.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/asm-arm/arch-ebsa285/time.h b/include/asm-arm/arch-ebsa285/time.h index b10bdd324..a837d8b0f 100644 --- a/include/asm-arm/arch-ebsa285/time.h +++ b/include/asm-arm/arch-ebsa285/time.h @@ -203,7 +203,8 @@ extern __inline__ void setup_timer(void) { int irq; - if (machine_is_co285()) + if (machine_is_co285() || + machine_is_personal_server()) /* * Add-in 21285s shouldn't access the RTC */ @@ -247,7 +248,9 @@ extern __inline__ void setup_timer(void) rtc_base = 0; } - if (machine_is_ebsa285() || machine_is_co285()) { + if (machine_is_ebsa285() || + machine_is_co285() || + machine_is_personal_server()) { gettimeoffset = timer1_gettimeoffset; *CSR_TIMER1_CLR = 0; |