From patchwork Tue Jun 11 16:49:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Austin X-Patchwork-Id: 2705121 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 54215C1459 for ; Tue, 11 Jun 2013 16:50:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 802362043C for ; Tue, 11 Jun 2013 16:50:41 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 16C632043B for ; Tue, 11 Jun 2013 16:50:40 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UmRlu-00029Q-3E; Tue, 11 Jun 2013 16:50:14 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UmRlh-0001C7-FK; Tue, 11 Jun 2013 16:50:01 +0000 Received: from service87.mimecast.com ([91.220.42.44]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UmRle-0001BD-Lr for linux-arm-kernel@lists.infradead.org; Tue, 11 Jun 2013 16:49:59 +0000 Received: from cam-owa2.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21]) by service87.mimecast.com; Tue, 11 Jun 2013 17:49:34 +0100 Received: from e102895-lin.cambridge.arm.com ([10.1.255.212]) by cam-owa2.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 11 Jun 2013 17:49:31 +0100 From: Jonathan Austin To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: arch_timer: add missing include for of_* functions Date: Tue, 11 Jun 2013 17:49:04 +0100 Message-Id: <1370969344-25764-1-git-send-email-jonathan.austin@arm.com> X-Mailer: git-send-email 1.7.9.5 X-OriginalArrivalTime: 11 Jun 2013 16:49:32.0037 (UTC) FILETIME=[A56D1B50:01CE66C3] X-MC-Unique: 113061117493402301 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130611_124958_948897_7D520EA3 X-CRM114-Status: GOOD ( 12.14 ) X-Spam-Score: -2.6 (--) Cc: mark.rutland@arm.com, Jonathan Austin X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The arch timer code uses a bunch of of_* functions that are defined in linux/of.h. Currently this header is not included but with CONFIG_OF defined the functions are available anyway. This was discovered because in the case that CONFIG_OF=n and ARM_ARCH_TIMER is selected, the kernel no longer builds due to the lack of this header. This patch fixes that (though without another patch - https://patchwork.kernel.org/patch/2242291/ - the build still fails due to a missing stub for of_find_matching_node()) Signed-off-by: Jonathan Austin Acked-by: Mark Rutland --- It seems to me that, no matter what your opinion on whether CONFIG_OF=n with CONFIG_ARM_ARCH_TIMER=y makes sense, we should fix this particular missing include. Jonny drivers/clocksource/arm_arch_timer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index d7ad425..c716ffa 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include