Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[ARM] 4869/1: ARM: OMAP: Fix compile for mcbsp

Until DSP MMU code is merged, dsp_request_mem() does not exist.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by

Tony Lindgren and committed by
Russell King
eec2beac 4e7ffb6a

+7 -1
+7 -1
include/asm-arm/arch-omap/dsp_common.h
··· 24 24 #ifndef ASM_ARCH_DSP_COMMON_H 25 25 #define ASM_ARCH_DSP_COMMON_H 26 26 27 - #ifdef CONFIG_ARCH_OMAP1 27 + #if defined(CONFIG_ARCH_OMAP1) && defined(CONFIG_OMAP_MMU_FWK) 28 28 extern void omap_dsp_request_mpui(void); 29 29 extern void omap_dsp_release_mpui(void); 30 30 extern int omap_dsp_request_mem(void); 31 31 extern int omap_dsp_release_mem(void); 32 + #else 33 + static inline int omap_dsp_request_mem(void) 34 + { 35 + return 0; 36 + } 37 + #define omap_dsp_release_mem() do {} while (0) 32 38 #endif 33 39 34 40 #endif /* ASM_ARCH_DSP_COMMON_H */