diff options
| author | Philippe De Muyter <phdm@macqel.be> | 2009-08-12 16:35:28 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2009-09-16 09:43:56 +1000 |
| commit | 2756730b798e4f1f8343cf034c33cc730ae3a5d4 (patch) | |
| tree | 81950822aa9652dfae82a1481b6671769ab0add1 /arch/m68k | |
| parent | 14c16db3906ba9453e9c786323f872e11fd0f48d (diff) | |
| download | linux-3.10-2756730b798e4f1f8343cf034c33cc730ae3a5d4.tar.gz linux-3.10-2756730b798e4f1f8343cf034c33cc730ae3a5d4.tar.bz2 linux-3.10-2756730b798e4f1f8343cf034c33cc730ae3a5d4.zip | |
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 b87f2f278f6..6759dad954f 100644 --- a/arch/m68k/include/asm/timex.h +++ b/arch/m68k/include/asm/timex.h @@ -3,10 +3,23 @@ * * m68k architecture timex specifications */ -#ifndef _ASMm68k_TIMEX_H -#define _ASMm68k_TIMEX_H +#ifndef _ASMm68K_TIMEX_H +#define _ASMm68K_TIMEX_H +#ifdef CONFIG_COLDFIRE +/* + * CLOCK_TICK_RATE should give the underlying frequency of the tick timer + * to make ntp work best. For Coldfires, that's the main clock. + */ +#include <asm/coldfire.h> +#define CLOCK_TICK_RATE MCF_CLK +#else +/* + * This default CLOCK_TICK_RATE is probably wrong for many 68k boards + * Users of those boards will need to check and modify accordingly + */ #define CLOCK_TICK_RATE 1193180 /* Underlying HZ */ +#endif typedef unsigned long cycles_t; |