diff options
author | Pete Popov <ppopov@embeddedalley.com> | 2005-07-14 13:47:57 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2005-10-29 14:31:54 -0400 |
commit | bdf21b18b4abf983db38f04ef7fec88f47389867 (patch) | |
tree | b7e551f09f0ee39f4a59132be4c0890e1ba80d91 /arch/mips/kernel/time.c | |
parent | e01402b115cccb6357f956649487aca2c6f7fbba (diff) |
Philips PNX8550 support: MIPS32-like core with 2 Trimedias on it.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/kernel/time.c')
-rw-r--r-- | arch/mips/kernel/time.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c index fbc153c8f833..a24651dfaaba 100644 --- a/arch/mips/kernel/time.c +++ b/arch/mips/kernel/time.c | |||
@@ -11,6 +11,7 @@ | |||
11 | * Free Software Foundation; either version 2 of the License, or (at your | 11 | * Free Software Foundation; either version 2 of the License, or (at your |
12 | * option) any later version. | 12 | * option) any later version. |
13 | */ | 13 | */ |
14 | #include <linux/config.h> | ||
14 | #include <linux/types.h> | 15 | #include <linux/types.h> |
15 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
16 | #include <linux/init.h> | 17 | #include <linux/init.h> |
@@ -112,8 +113,10 @@ static void c0_timer_ack(void) | |||
112 | { | 113 | { |
113 | unsigned int count; | 114 | unsigned int count; |
114 | 115 | ||
116 | #ifndef CONFIG_SOC_PNX8550 /* pnx8550 resets to zero */ | ||
115 | /* Ack this timer interrupt and set the next one. */ | 117 | /* Ack this timer interrupt and set the next one. */ |
116 | expirelo += cycles_per_jiffy; | 118 | expirelo += cycles_per_jiffy; |
119 | #endif | ||
117 | write_c0_compare(expirelo); | 120 | write_c0_compare(expirelo); |
118 | 121 | ||
119 | /* Check to see if we have missed any timer interrupts. */ | 122 | /* Check to see if we have missed any timer interrupts. */ |