On 6/13/2011 11:55 AM, Vadillo, Miguel wrote:
From 0cffeab240c6009fbc81783cec16d35dc240196a Mon Sep 17 00:00:00 2001 From: Miguel Vadillo<vadillo@xxxxxx> Date: Fri, 10 Jun 2011 16:06:20 -0500 Subject: [PATCH] omap4: fix build error when undefining CONFIG_SMP Function omap_smc2 is undeclared when disabling SMP Signed-off-by: Miguel Vadillo<vadillo@xxxxxx> --- arch/arm/mach-omap2/include/mach/omap4-common.h | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
Acked-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
diff --git a/arch/arm/mach-omap2/include/mach/omap4-common.h b/arch/arm/mach-omap2/include/mach/omap4-common.h index f9769d3..1923b4e 100644 --- a/arch/arm/mach-omap2/include/mach/omap4-common.h +++ b/arch/arm/mach-omap2/include/mach/omap4-common.h @@ -74,7 +74,7 @@ extern int omap4_mpuss_init(void); extern int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state); extern void omap4_cpu_suspend(unsigned int cpu, unsigned int save_state); extern void omap4_cpu_resume(void); -extern u32 omap_smc2(u32 id, u32 falg, u32 pargs); +extern u32 omap_smc2(u32 id, u32 flag, u32 pargs); extern u32 omap4_secure_dispatcher(u32 idx, u32 flag, u32 nargs, u32 arg1, u32 arg2, u32 arg3, u32 arg4); #else @@ -99,6 +99,10 @@ static inline void omap4_cpu_resume(void) { } +static inline u32 omap_smc2(u32 id, u32 flag, u32 pargs) +{ + return 0; +} #endif #endif /* __ASSEMBLER__ */ #endif /* OMAP_ARCH_OMAP4_COMMON_H */ -- 1.7.1
-- 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