From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759864AbbCDTgt (ORCPT ); Wed, 4 Mar 2015 14:36:49 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:62808 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758172AbbCDTds (ORCPT ); Wed, 4 Mar 2015 14:33:48 -0500 From: Arnd Bergmann To: linux-arm-msm@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, David Brown , Daniel Walker , Bryan Huntsman , Stephen Boyd , Tim Bird , Bjorn Andersson , Linus Walleij , linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Ulf Hansson , Arnd Bergmann Subject: [RFC PATCH 11/18] clocksource: qcom: make mach-msm and mach-qcom coexist Date: Wed, 4 Mar 2015 20:33:05 +0100 Message-Id: <1425497592-1831064-12-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.1.0.rc2 In-Reply-To: <1425497592-1831064-1-git-send-email-arnd@arndb.de> References: <1425497592-1831064-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:dEfgq0zxlSBpjprgwPGza9f7+uLHETLFJGZgoB9wdCEFODaC0sf AgCwu25i90X3q5qXJ4C3MtWmiGsgqJ1ZMEbm54x/TjCjGmnQzY2wU6idXqLHKo4aiWUALn0 HTFB2XYiAZEb4hOsOXaqcT1DMHQbhfDndiKLQVlXwfEBjdm5HUTmaAPk6p5PPE76dPDaZ8e WfhGiqAeDU5+KfMh+8udQ== X-UI-Out-Filterresults: notjunk:1; Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The driver uses #if/#else to decide which initialization code should be used, which of course breaks if we have both in the same kernel. This changes the #else path to check for ARCH_MSM. Signed-off-by: Arnd Bergmann --- drivers/clocksource/qcom-timer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/clocksource/qcom-timer.c b/drivers/clocksource/qcom-timer.c index 098c542e5c53..48c8df62f49a 100644 --- a/drivers/clocksource/qcom-timer.c +++ b/drivers/clocksource/qcom-timer.c @@ -285,8 +285,9 @@ static void __init msm_dt_timer_init(struct device_node *np) } CLOCKSOURCE_OF_DECLARE(kpss_timer, "qcom,kpss-timer", msm_dt_timer_init); CLOCKSOURCE_OF_DECLARE(scss_timer, "qcom,scss-timer", msm_dt_timer_init); -#else +#endif +#ifdef CONFIG_ARCH_MSM static int __init msm_timer_map(phys_addr_t addr, u32 event, u32 source, u32 sts) { -- 2.1.0.rc2