From patchwork Sun Oct 7 17:42:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 1561901 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 074ECDFF71 for ; Sun, 7 Oct 2012 17:44:06 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TKus6-0002dj-2B; Sun, 07 Oct 2012 17:42:34 +0000 Received: from mail-pa0-f49.google.com ([209.85.220.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TKus3-0002d6-0c for linux-arm-kernel@lists.infradead.org; Sun, 07 Oct 2012 17:42:31 +0000 Received: by mail-pa0-f49.google.com with SMTP id bi5so3593604pad.36 for ; Sun, 07 Oct 2012 10:42:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=c76ax+80B1rCSoLrhh1gaLJEeGsNYn2aWV2qCkD0Nyg=; b=SWey6MzhSPujtju4xt32vDFBC3Sq7wQ4ktoghdEhs1V2tS1sKg2dMUNVBMELl499I6 xp+NSXBl1nBYoXuvKbteriLul4pcMNMy54fkfNAf5LT6yOaZWShvOVp7YJI52rn8ovCp 8PLAb6eDy35zew7RORHlJie8TcWGBhBRAyeprwZ2scGxJ+BZelWJ7JEkXSSzFzY0NWAg eIuPybT/nk0kjWuDXwqnyOHDCuH0MH4tj4d9+Qpzfx5sgy9MGzTPRqkoOU/axvQGKNzg QJctTg3RsbaT5zPgVYOgCFXxY8gPmKchgVUnPlLz5Ku3PkMJLsFuR2fYIlasDibfKADI fOGg== Received: by 10.68.204.2 with SMTP id ku2mr47367996pbc.59.1349631749773; Sun, 07 Oct 2012 10:42:29 -0700 (PDT) Received: from quad.lixom.net (173-13-129-225-sfba.hfc.comcastbusiness.net. [173.13.129.225]) by mx.google.com with ESMTPS id it6sm9379823pbc.14.2012.10.07.10.42.27 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 07 Oct 2012 10:42:28 -0700 (PDT) From: Olof Johansson To: Russell King Subject: [PATCH] ARM: integrator_cp: fix build failure Date: Sun, 7 Oct 2012 10:42:40 -0700 Message-Id: <1349631760-21350-1-git-send-email-olof@lixom.net> X-Mailer: git-send-email 1.7.10.1.488.g05fbf7a X-Gm-Message-State: ALoCoQmTI+sdh+b/nXQHeH2RhIyBCgRbpxa7u9aqF43rEiTof9gZELXPfgjHKuFkQUUdSvyHvCTa X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.220.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Olof Johansson , Linus Walleij , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org arch/arm/mach-integrator/integrator_cp.c:272:32: error: 'of_aliases' undeclared (first use in this function) Move the OF-only timer init under #ifdef CONFIG_OF, just like integrator_ap has it. Signed-off-by: Olof Johansson Reviewed-by: Linus Walleij --- arch/arm/mach-integrator/integrator_cp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c index 6870a1f..5b08e8e 100644 --- a/arch/arm/mach-integrator/integrator_cp.c +++ b/arch/arm/mach-integrator/integrator_cp.c @@ -261,6 +261,8 @@ static void __init intcp_init_early(void) #endif } +#ifdef CONFIG_OF + static void __init intcp_timer_init_of(void) { struct device_node *node; @@ -297,8 +299,6 @@ static struct sys_timer cp_of_timer = { .init = intcp_timer_init_of, }; -#ifdef CONFIG_OF - static const struct of_device_id fpga_irq_of_match[] __initconst = { { .compatible = "arm,versatile-fpga-irq", .data = fpga_irq_of_init, }, { /* Sentinel */ }