From patchwork Wed Nov 28 02:15:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Hunter, Jon" X-Patchwork-Id: 1813531 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 02A77DF254 for ; Wed, 28 Nov 2012 02:15:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751468Ab2K1CPl (ORCPT ); Tue, 27 Nov 2012 21:15:41 -0500 Received: from bear.ext.ti.com ([192.94.94.41]:41407 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750961Ab2K1CPk (ORCPT ); Tue, 27 Nov 2012 21:15:40 -0500 Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id qAS2FTeF014822; Tue, 27 Nov 2012 20:15:29 -0600 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id qAS2FTqE018346; Tue, 27 Nov 2012 20:15:29 -0600 Received: from dlelxv24.itg.ti.com (172.17.1.199) by dfle72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.1.323.3; Tue, 27 Nov 2012 20:15:28 -0600 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dlelxv24.itg.ti.com (8.13.8/8.13.8) with ESMTP id qAS2FSF0024619; Tue, 27 Nov 2012 20:15:28 -0600 Received: from localhost (h114-231.vpn.ti.com [172.24.114.231]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id qAS2FQw05053; Tue, 27 Nov 2012 20:15:26 -0600 (CST) From: Jon Hunter To: Tony Lindgren CC: linux-omap , linux-arm , Jon Hunter , Igor Grinberg Subject: [PATCH 2/3] ARM: OMAP4: Fix build error and warning in timer.c Date: Tue, 27 Nov 2012 20:15:14 -0600 Message-ID: <1354068915-3378-3-git-send-email-jon-hunter@ti.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1354068915-3378-1-git-send-email-jon-hunter@ti.com> References: <1354068915-3378-1-git-send-email-jon-hunter@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org When compiling the kernel with configuration option CONFIG_ARCH_OMAP4 enabled and CONFIG_LOCAL_TIMERS disabled, the following build error and warning is seen. CC arch/arm/mach-omap2/timer.o arch/arm/mach-omap2/timer.c: In function ‘omap4_local_timer_init’: arch/arm/mach-omap2/timer.c:630:2: error: implicit declaration of function ‘omap4_sync32_timer_init’ [-Werror=implicit-function-declaration] arch/arm/mach-omap2/timer.c: At top level: arch/arm/mach-omap2/timer.c:607:1: warning: ‘omap4_sync32k_timer_init’ defined but not used [-Wunused-function] cc1: some warnings being treated as errors make[1]: *** [arch/arm/mach-omap2/timer.o] Error 1 This issue was introduced by commit 6f80b3b (ARM: OMAP2+: timer: remove CONFIG_OMAP_32K_TIMER) where the "k" is missing from the "sync32k" in the function name "omap4_sync32_timer_init". Therefore, correct this typo to resolve the above error and warning. Cc: Igor Grinberg Reported-by: Tony Lindgren Signed-off-by: Jon Hunter Acked-by: Santosh Shilimkar Acked-by: Igor Grinberg --- arch/arm/mach-omap2/timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index a9f99e3..eb96712 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -627,7 +627,7 @@ static void __init omap4_local_timer_init(void) #else /* CONFIG_LOCAL_TIMERS */ static inline void omap4_local_timer_init(void) { - omap4_sync32_timer_init(); + omap4_sync32k_timer_init(); } #endif /* CONFIG_LOCAL_TIMERS */ OMAP_SYS_TIMER(4, local);