From mboxrd@z Thu Jan 1 00:00:00 1970 From: Subject: [PATCH 28/36] m68k: ColdFire with MMU enabled uses same clocking code as non-MMU Date: Tue, 25 Oct 2011 17:19:20 +1000 Message-ID: <1319527168-11166-29-git-send-email-gerg@snapgear.com> References: <1319527168-11166-1-git-send-email-gerg@snapgear.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from sncsmrelay2.nai.com ([67.97.80.206]:25141 "EHLO sncsmrelay2.nai.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754425Ab1JYHTj (ORCPT ); Tue, 25 Oct 2011 03:19:39 -0400 In-Reply-To: <1319527168-11166-1-git-send-email-gerg@snapgear.com> Sender: linux-m68k-owner@vger.kernel.org List-Id: linux-m68k@vger.kernel.org To: linux-m68k@vger.kernel.org, uclinux-dev@uclinux.org Cc: Greg Ungerer From: Greg Ungerer We want to use the same timer support code for ColdFire CPU's when running with MMU enabled or not. So use the same time_no.c code even when the MMU is enabled for ColdFire. Signed-off-by: Greg Ungerer --- arch/m68k/kernel/time.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c index a5cf40c..75ab79b 100644 --- a/arch/m68k/kernel/time.c +++ b/arch/m68k/kernel/time.c @@ -1,4 +1,4 @@ -#ifdef CONFIG_MMU +#if defined(CONFIG_MMU) && !defined(CONFIG_COLDFIRE) #include "time_mm.c" #else #include "time_no.c" -- 1.7.0.4