The result of building an OMAP2 configuration for merged mainline, master and devel branches is: CC arch/arm/mach-omap2/devices.o arch/arm/mach-omap2/devices.c:160: error: ■OMAP34XX_MAILBOX_BASE■ undeclared here (not in a function) Please resolve ASAP - if I don't have a patch by this evening, I will commit the work-around below: diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index d6b4b2f..d16d880 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -156,6 +156,7 @@ static struct resource omap2_mbox_resources[] = { }; static struct resource omap3_mbox_resources[] = { +#ifdef CONFIG_ARCH_OMAP3 { .start = OMAP34XX_MAILBOX_BASE, .end = OMAP34XX_MAILBOX_BASE + MBOX_REG_SIZE - 1, @@ -165,6 +166,7 @@ static struct resource omap3_mbox_resources[] = { .start = INT_24XX_MAIL_U0_MPU, .flags = IORESOURCE_IRQ, }, +#endif }; static struct platform_device mbox_device = { -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html