Re: [PATCH] OMAP2: fix recent build breakage

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



* Paul Walmsley <paul@xxxxxxxxx> [081223 08:28]:
> 
> 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
>     

Pushing to l-o today.

Tony


> Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
> 
> diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
> index 937fb18..d7e848e 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 2f82e28..27a1e45 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
>  
> --
> 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
--
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

[Index of Archives]     [Linux Arm (vger)]     [ARM Kernel]     [ARM MSM]     [Linux Tegra]     [Linux WPAN Networking]     [Linux Wireless Networking]     [Maemo Users]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Trails]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux