From: Tony Lindgren <tony@atomide.com>
Date: Mon, 17 Mar 2008 08:05:40 +0000 (+0200)
Subject: ARM: OMAP: Fix compile for mcbsp
X-Git-Tag: v2.6.25-omap1~120
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=cbc0cff80e5ff9ded05edcce813394003e0a7e80;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Fix compile for mcbsp

If MMU fwk is not selected, compile fails otherwise.

Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/include/asm-arm/arch-omap/dsp_common.h b/include/asm-arm/arch-omap/dsp_common.h
index fa8f3a65f6d..e515801b4b8 100644
--- a/include/asm-arm/arch-omap/dsp_common.h
+++ b/include/asm-arm/arch-omap/dsp_common.h
@@ -49,12 +49,12 @@ struct omap_dsp {
 	int			initialized;
 };
 
-#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);
-#elif defined(CONFIG_ARCH_OMAP2)
+#else
 static inline int omap_dsp_request_mem(void)
 {
 	return 0;