]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
ARM: OMAP: Fix compilation of dsp_mem.c
authorDirk Behme <dirk.behme@googlemail.com>
Sat, 19 May 2007 14:48:51 +0000 (16:48 +0200)
committerTony Lindgren <tony@atomide.com>
Fri, 25 May 2007 00:27:35 +0000 (17:27 -0700)
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>
arch/arm/plat-omap/dsp/dsp_mem.c

index eab57b531cd21709bc66187531172e2d59bed3ef..f75ab7d4c2884e9d99067525115922ff50734f96 100644 (file)
@@ -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");