[PATCH] ARM: OMAP: Fix compilation of dsp_mem.c

Dirk Behme
2007-05-19T14:48:51Z

[-- Attachment #1: Type: text/plain, Size: 281 bytes --]

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>

[-- Attachment #2: fix_error_omapfb_ready_undeclared.txt --]
[-- Type: text/plain, Size: 854 bytes --]

Index: linux-osk/arch/arm/plat-omap/dsp/dsp_mem.c
===================================================================
--- linux-osk.orig/arch/arm/plat-omap/dsp/dsp_mem.c
+++ linux-osk/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 *dspa
{
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");

[-- Attachment #3: Type: text/plain, Size: 0 bytes --]