[ARM] 4869/1: ARM: OMAP: Fix compile for mcbsp
authorTony Lindgren <tony@atomide.com>
Mon, 17 Mar 2008 12:01:07 +0000 (13:01 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 20 Mar 2008 15:59:31 +0000 (15:59 +0000)
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>
include/asm-arm/arch-omap/dsp_common.h

index c61f868f24ee8de1590c0cb0743f7a0ce8452475..da97736f3efae3105dffcbaae511ef618d725f62 100644 (file)
 #ifndef ASM_ARCH_DSP_COMMON_H
 #define ASM_ARCH_DSP_COMMON_H
 
-#ifdef CONFIG_ARCH_OMAP1
+#if defined(CONFIG_ARCH_OMAP1) && defined(CONFIG_OMAP_MMU_FWK)
 extern void omap_dsp_request_mpui(void);
 extern void omap_dsp_release_mpui(void);
 extern int omap_dsp_request_mem(void);
 extern int omap_dsp_release_mem(void);
+#else
+static inline int omap_dsp_request_mem(void)
+{
+       return 0;
+}
+#define omap_dsp_release_mem() do {} while (0)
 #endif
 
 #endif /* ASM_ARCH_DSP_COMMON_H */