From patchwork Thu Feb 9 19:15:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Russell King - ARM Linux X-Patchwork-Id: 140424 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (unknown [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 15F71B6F98 for ; Fri, 10 Feb 2012 06:18:48 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RvZTR-0002Xw-MQ; Thu, 09 Feb 2012 19:16:05 +0000 Received: from [2002:4e20:1eda::1] (helo=caramon.arm.linux.org.uk) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1RvZTO-0002Xi-Mq for linux-arm-kernel@lists.infradead.org; Thu, 09 Feb 2012 19:16:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=arm.linux.org.uk; s=caramon; h=Sender:In-Reply-To:Content-Transfer-Encoding:Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To:From:Date; bh=OZ1HxMzyn9GPVtoZuwqyOriJ0+PbS+n+NaTElZtgBiI=; b=N1SdSqgJx+NPZOMD/x8X7OCdzoTF+TzPlA/OxMnV1+4Cc+9LBQ30fyv8U8ZQ2iGj821LzyEObuuNr/r+GnrBjfDbNgyin1cD8/f3jvEVu8yrVLjOalTGZpG+Y3DIjaRebj2t7WYzmcrvQZkIWCAUqI8niN6EN+pAW27uOO8gCBk=; Received: from n2100.arm.linux.org.uk ([2002:4e20:1eda:1:214:fdff:fe10:4f86]:51786) by caramon.arm.linux.org.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1RvZTB-0007p2-HS; Thu, 09 Feb 2012 19:15:50 +0000 Received: from linux by n2100.arm.linux.org.uk with local (Exim 4.76) (envelope-from ) id 1RvZTA-00066T-4C; Thu, 09 Feb 2012 19:15:48 +0000 Date: Thu, 9 Feb 2012 19:15:47 +0000 From: Russell King - ARM Linux To: "Cousson, Benoit" Subject: Re: [PATCH] ARM: OMAP2+: Fix prm2xxx_3xxx.c INT_34XX_PRCM_MPU_IRQ build error Message-ID: <20120209191547.GD19159@n2100.arm.linux.org.uk> References: <4F3417F5.2090901@ti.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <4F3417F5.2090901@ti.com> User-Agent: Mutt/1.5.19 (2009-01-05) X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.2 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.8 RDNS_NONE Delivered to internal network by a host with no rDNS Cc: Tony Lindgren , "Kristo, Tero" , "linux-omap@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org On Thu, Feb 09, 2012 at 08:01:09PM +0100, Cousson, Benoit wrote: > If CONFIG_OF is not defined, the following error will happen. > > arch/arm/mach-omap2/prm2xxx_3xxx.c:41:11: error: > ‘INT_34XX_PRCM_MPU_IRQ’ undeclared here (not in a function) > > This is due to some hidden headers path from linux/of.h to plat/irqs.h > already reported by Russell for prm4xxx.c. I have the following commit from mainline. I suspect you have an old tree. Note: for the next merge window, I'm removing the asm/irq.h include from asm/prom.h so that this kind of thing doesn't happen in the future. commit d19e8f2e44a34b2a461f67ce9d0cb5bd43197c1e Author: Paul Walmsley Date: Wed Jan 25 12:57:49 2012 -0700 ARM: OMAP2/3: PRM: fix missing plat/irqs.h build breakage Commit 22f51371f8c35869ed850f46aa76b6cc2b502110 ("ARM: OMAP3: pm: use prcm chain handler") breaks the build on a 2420-only config, due to a missing include for plat/irqs.h: CC arch/arm/mach-omap2/prm2xxx_3xxx.o arch/arm/mach-omap2/prm2xxx_3xxx.c:41:11: error: 'INT_34XX_PRCM_MPU_IRQ' undeclared here (not in a function) Fix by explicitly including it. Signed-off-by: Paul Walmsley Cc: Tero Kristo Cc: Kevin Hilman diff --git a/arch/arm/mach-omap2/prm2xxx_3xxx.c b/arch/arm/mach-omap2/prm2xxx_3xxx.c index c1c4d86..9ce7654 100644 --- a/arch/arm/mach-omap2/prm2xxx_3xxx.c +++ b/arch/arm/mach-omap2/prm2xxx_3xxx.c @@ -19,6 +19,7 @@ #include "common.h" #include #include +#include #include "vp.h"