From patchwork Tue Mar 12 17:08:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 15292 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 6BB6E23E3E for ; Tue, 12 Mar 2013 17:09:10 +0000 (UTC) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by fiordland.canonical.com (Postfix) with ESMTP id 29362A18777 for ; Tue, 12 Mar 2013 17:09:10 +0000 (UTC) Received: by mail-vc0-f180.google.com with SMTP id fo13so32897vcb.25 for ; Tue, 12 Mar 2013 10:09:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=+VtYsMTcPo4nQZGIiIOfb9KNloM0QxncGfv3mKIQtOQ=; b=Texqncm+PWRQ68PUy3Q2vagJKGOAg/pJ9R+nsa2H27t0g2rS/I7uomNoKsx466M6x/ 9pEvbIBqHFv4glcJSCUFl7LZxXcwmkte03jfa+4aRWLC9VOw9HkFJeXZ83OM2YUEwOav basiv/Flfi+PBO5n4H1RMN/y1SaKiy2twrK89Msd4bYIs3+GemMw42rS4B2DlJIv0/Ew EFQUmHOo8Y4AbBBXTMQ2ErGOUDiL/fyLWT7r1vDqgVf+dxVEk2uYR2yzAtURc1ZrJKEt pnmvZ4FJJXM2fDqg92oWvwqVNqSKdLwvzBNFBppzZpds1TL1a29mjKIPomWMKEqqLbJq qtog== X-Received: by 10.58.188.48 with SMTP id fx16mr6994751vec.22.1363108149597; Tue, 12 Mar 2013 10:09:09 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp138380veb; Tue, 12 Mar 2013 10:09:09 -0700 (PDT) X-Received: by 10.182.164.8 with SMTP id ym8mr12863879obb.68.1363108149112; Tue, 12 Mar 2013 10:09:09 -0700 (PDT) Received: from mail-ie0-x231.google.com (mail-ie0-x231.google.com [2607:f8b0:4001:c03::231]) by mx.google.com with ESMTPS id ac8si20922691obc.49.2013.03.12.10.09.08 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 12 Mar 2013 10:09:09 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:4001:c03::231 is neither permitted nor denied by best guess record for domain of haojian.zhuang@linaro.org) client-ip=2607:f8b0:4001:c03::231; Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:4001:c03::231 is neither permitted nor denied by best guess record for domain of haojian.zhuang@linaro.org) smtp.mail=haojian.zhuang@linaro.org Received: by mail-ie0-f177.google.com with SMTP id 16so99302iea.36 for ; Tue, 12 Mar 2013 10:09:08 -0700 (PDT) X-Received: by 10.42.204.79 with SMTP id fl15mr12943584icb.57.1363108148445; Tue, 12 Mar 2013 10:09:08 -0700 (PDT) Received: from localhost.localdomain ([140.206.155.72]) by mx.google.com with ESMTPS id xc3sm20593825igb.10.2013.03.12.10.09.03 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 12 Mar 2013 10:09:07 -0700 (PDT) From: Haojian Zhuang To: linux@arm.linux.org.uk, linus.walleij@linaro.org, arnd@arndb.de, olof@lixom.net, rob.herring@calxeda.com, linux-arm-kernel@lists.infradead.org, pawel.moll@arm.com, swarren@nvidia.com, john.stultz@linaro.org, tglx@linutronix.de, mturquette@linaro.org Cc: patches@linaro.org, Haojian Zhuang Subject: [PATCH v2 03/14] clocksource: sp804: append CONFIG_OF Date: Wed, 13 Mar 2013 01:08:32 +0800 Message-Id: <1363108124-17484-4-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1363108124-17484-1-git-send-email-haojian.zhuang@linaro.org> References: <1363108124-17484-1-git-send-email-haojian.zhuang@linaro.org> X-Gm-Message-State: ALoCoQmnH41+PT4SnyPE8N6rQ+kHjAWiHU+Nnkj4K6gi0C3q+aaJrZgv6Ovvr5ccYcZJhAl+q9vg of_find_matching_node() & of_device_is_available() are depend on CONFIG_OF macro. If CONFIG_OF isn't defined for non-DT mode, the build error occurs. So add CONFIG_OF for those DT functions. Signed-off-by: Haojian Zhuang --- drivers/clocksource/timer-sp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/clocksource/timer-sp.c b/drivers/clocksource/timer-sp.c index f8c2c54..5f2d700 100644 --- a/drivers/clocksource/timer-sp.c +++ b/drivers/clocksource/timer-sp.c @@ -197,6 +197,7 @@ void __init sp804_clockevents_init(void __iomem *base, unsigned int irq, clockevents_config_and_register(evt, rate, 0xf, 0xffffffff); } +#ifdef CONFIG_OF static struct device_node *from = NULL; static struct of_device_id sp804_timer_match[] __initdata = { @@ -294,3 +295,4 @@ err: iounmap(base); } CLOCKSOURCE_OF_DECLARE(sp804, "arm,sp804", sp804_dt_init); +#endif