From mboxrd@z Thu Jan 1 00:00:00 1970 From: linux@arm.linux.org.uk (Russell King - ARM Linux) Date: Thu, 9 Feb 2012 19:15:47 +0000 Subject: [PATCH] ARM: OMAP2+: Fix prm2xxx_3xxx.c INT_34XX_PRCM_MPU_IRQ build error In-Reply-To: <4F3417F5.2090901@ti.com> References: <4F3417F5.2090901@ti.com> Message-ID: <20120209191547.GD19159@n2100.arm.linux.org.uk> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.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"