tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
authored by
Philippe De Muyter
and committed by
Greg Ungerer
2756730b
14c16db3
+15
-2
+15
-2
arch/m68k/include/asm/timex.h
+15
-2
arch/m68k/include/asm/timex.h
···
3
3
*
4
4
* m68k architecture timex specifications
5
5
*/
6
-
#ifndef _ASMm68k_TIMEX_H
7
-
#define _ASMm68k_TIMEX_H
6
+
#ifndef _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
21
#define CLOCK_TICK_RATE 1193180 /* Underlying HZ */
22
+
#endif
10
23
11
24
typedef unsigned long cycles_t;
12
25