From: Paul Walmsley Date: Tue, 23 Dec 2008 06:28:10 +0000 (-0700) Subject: OMAP2: fix recent build breakage X-Git-Tag: v2.6.28-omap1~53 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?p=linux-2.6-omap-h63xx.git;a=commitdiff_plain;h=e119a1d7e8b95618627b95ea7db7a39204b7e3d4 OMAP2: fix recent build breakage Fix recent build breakage. Boot-tested on N800. CC arch/arm/mach-omap2/devices.o arch/arm/mach-omap2/devices.c:110: error: 'OMAP34XX_MAILBOX_BASE' undeclared here (not in a function) arch/arm/mach-omap2/devices.c:115: error: 'INT_34XX_MAIL_U0_MPU' undeclared here (not in a function) make[1]: *** [arch/arm/mach-omap2/devices.o] Error 1 Signed-off-by: Paul Walmsley Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 937fb1840b7..d7e848e80bf 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -112,7 +112,7 @@ static struct resource omap3_mbox_resources[] = { .flags = IORESOURCE_MEM, }, { - .start = INT_34XX_MAIL_U0_MPU, + .start = INT_24XX_MAIL_U0_MPU, .flags = IORESOURCE_IRQ, }, }; diff --git a/arch/arm/plat-omap/include/mach/omap34xx.h b/arch/arm/plat-omap/include/mach/omap34xx.h index 2f82e28eda0..27a1e45b5d0 100644 --- a/arch/arm/plat-omap/include/mach/omap34xx.h +++ b/arch/arm/plat-omap/include/mach/omap34xx.h @@ -56,6 +56,9 @@ #define OMAP34XX_SR1_BASE 0x480C9000 #define OMAP34XX_SR2_BASE 0x480CB000 +#define OMAP34XX_CAMERA_BASE (L4_34XX_BASE + 0xBC000) +#define OMAP34XX_MAILBOX_BASE (L4_34XX_BASE + 0x94000) + #if defined(CONFIG_ARCH_OMAP3430) @@ -63,8 +66,6 @@ #define OMAP2_CM_BASE OMAP3430_CM_BASE #define OMAP2_PRM_BASE OMAP3430_PRM_BASE #define OMAP2_VA_IC_BASE IO_ADDRESS(OMAP34XX_IC_BASE) -#define OMAP34XX_CAMERA_BASE (L4_34XX_BASE + 0xBC000) -#define OMAP34XX_MAILBOX_BASE (L4_34XX_BASE + 0x94000) #endif