From: Dirk Behme <dirk.behme@googlemail.com>
Date: Sat, 19 May 2007 14:48:51 +0000 (+0200)
Subject: ARM: OMAP: Fix compilation of dsp_mem.c
X-Git-Tag: v2.6.22-omap1~135
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ef71bf871b8881a5218042e22516dc6e1fe3b8b8;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Fix compilation of dsp_mem.c

Fix compilation of dsp_mem.c. omapfb_ready is only available if
CONFIG_FB_OMAP_LCDC_EXTERNAL is set, else compiler stops with error.
status is only used in case CONFIG_FB_OMAP_LCDC_EXTERNAL is set.
Compiler warns about this.

Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/plat-omap/dsp/dsp_mem.c b/arch/arm/plat-omap/dsp/dsp_mem.c
index eab57b531cd..f75ab7d4c28 100644
--- a/arch/arm/plat-omap/dsp/dsp_mem.c
+++ b/arch/arm/plat-omap/dsp/dsp_mem.c
@@ -210,11 +210,13 @@ void mbox_fbctl_upd(void)
 	win.format = buf[4];
 	release_ipbuf_pvt(ipbuf_sys_da);
 
+#ifdef CONFIG_FB_OMAP_LCDC_EXTERNAL
 	if (!omapfb_ready) {
 		printk(KERN_WARNING
 		       "omapdsp: fbupd() called while HWA742 is not ready!\n");
 		return;
 	}
+#endif
 	omapfb_update_window_async(registered_fb[0], &win, fbupd_cb, NULL);
 }
 
@@ -237,7 +239,10 @@ static int dsp_fbexport(dsp_long_t *dspadr)
 {
 	dsp_long_t dspadr_actual;
 	unsigned long padr_sys, padr, fbsz_sys, fbsz;
-	int cnt, status;
+	int cnt;
+#ifdef CONFIG_FB_OMAP_LCDC_EXTERNAL
+	int status;
+#endif
 
 	pr_debug( "omapdsp: frame buffer export\n");