summaryrefslogtreecommitdiffstats
path: root/arch/m68k/include
diff options
context:
space:
mode:
authorGreg Ungerer2015-07-07 06:21:21 +0200
committerGreg Ungerer2015-07-13 01:34:39 +0200
commitd9ee489619744ee5ac246b8fb3dd65bb078d2f0a (patch)
tree25ae659f5a1d929a4948a2a6147b0fa3874f514c /arch/m68k/include
parentLinux 4.2-rc2 (diff)
downloadkernel-qcow2-linux-d9ee489619744ee5ac246b8fb3dd65bb078d2f0a.tar.gz
kernel-qcow2-linux-d9ee489619744ee5ac246b8fb3dd65bb078d2f0a.tar.xz
kernel-qcow2-linux-d9ee489619744ee5ac246b8fb3dd65bb078d2f0a.zip
m68knommu: force setting of CONFIG_CLOCK_FREQ for ColdFire
It is possible to disable the clock selection at configuration time, but for ColdFire targets we always expect a clock frequency to be selected. This results in the following compile time error: CC arch/m68k/kernel/asm-offsets.s In file included from ./arch/m68k/include/asm/timex.h:14:0, from include/linux/timex.h:65, from include/linux/sched.h:19, from arch/m68k/kernel/asm-offsets.c:14: ./arch/m68k/include/asm/coldfire.h:25:2: error: #error "Don't know what your ColdFire CPU clock frequency is??" Remove CONFIG_CLOCK_SELECT completely and always enable CONFIG_CLOCK_FREQ for ColdFire. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/include')
-rw-r--r--arch/m68k/include/asm/coldfire.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/coldfire.h b/arch/m68k/include/asm/coldfire.h
index c94557b91448..50aa4dac9ca2 100644
--- a/arch/m68k/include/asm/coldfire.h
+++ b/arch/m68k/include/asm/coldfire.h
@@ -19,7 +19,7 @@
* in any case new boards come along from time to time that have yet
* another different clocking frequency.
*/
-#ifdef CONFIG_CLOCK_SET
+#ifdef CONFIG_CLOCK_FREQ
#define MCF_CLK CONFIG_CLOCK_FREQ
#else
#error "Don't know what your ColdFire CPU clock frequency is??"