diff options
author | Philippe De Muyter <phdm@macqel.be> | 2009-08-12 02:35:28 -0400 |
---|---|---|
committer | Greg Ungerer <gerg@uclinux.org> | 2009-09-15 19:43:56 -0400 |
commit | 2756730b798e4f1f8343cf034c33cc730ae3a5d4 (patch) | |
tree | 81950822aa9652dfae82a1481b6671769ab0add1 /arch/m68k | |
parent | 14c16db3906ba9453e9c786323f872e11fd0f48d (diff) |
m68knommu: fix ColdFire definition of CLOCK_TICK_RATE
The good definition of CLOCK_TICK_RATE for coldfires has been lost in the
merge of m68k and m68knommu include files. Restore it. Culprit :
commit ebafc17468d58bd903c886175ca84a4edc69ae1d
Signed-off-by: Philippe De Muyter <phdm@macqel.be>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r-- | arch/m68k/include/asm/timex.h | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/arch/m68k/include/asm/timex.h b/arch/m68k/include/asm/timex.h index b87f2f278f67..6759dad954f6 100644 --- a/arch/m68k/include/asm/timex.h +++ b/arch/m68k/include/asm/timex.h | |||
@@ -3,10 +3,23 @@ | |||
3 | * | 3 | * |
4 | * m68k architecture timex specifications | 4 | * m68k architecture timex specifications |
5 | */ | 5 | */ |
6 | #ifndef _ASMm68k_TIMEX_H | 6 | #ifndef _ASMm68K_TIMEX_H |
7 | #define _ASMm68k_TIMEX_H | 7 | #define _ASMm68K_TIMEX_H |
8 | 8 | ||
9 | #ifdef CONFIG_COLDFIRE | ||
10 | /* | ||
11 | * CLOCK_TICK_RATE should give the underlying frequency of the tick timer | ||
12 | * to make ntp work best. For Coldfires, that's the main clock. | ||
13 | */ | ||
14 | #include <asm/coldfire.h> | ||
15 | #define CLOCK_TICK_RATE MCF_CLK | ||
16 | #else | ||
17 | /* | ||
18 | * This default CLOCK_TICK_RATE is probably wrong for many 68k boards | ||
19 | * Users of those boards will need to check and modify accordingly | ||
20 | */ | ||
9 | #define CLOCK_TICK_RATE 1193180 /* Underlying HZ */ | 21 | #define CLOCK_TICK_RATE 1193180 /* Underlying HZ */ |
22 | #endif | ||
10 | 23 | ||
11 | typedef unsigned long cycles_t; | 24 | typedef unsigned long cycles_t; |
12 | 25 | ||