From: Dirk Behme <dirk.behme@googlemail.com>
Date: Tue, 1 May 2007 13:25:16 +0000 (+0200)
Subject: ARM: OMAP: Fix warning in lcdc.c
X-Git-Tag: v2.6.22-omap1~10^2
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=a69d462277e9829b8beef541bb777a4fbfc5eeb1;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Fix warning in lcdc.c

Fix warning

drivers/video/omap/lcdc.c:878: warning: initialization from
incompatible pointer type

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

diff --git a/drivers/video/omap/lcdc.c b/drivers/video/omap/lcdc.c
index 0f868436a4f..197efe8b70b 100644
--- a/drivers/video/omap/lcdc.c
+++ b/drivers/video/omap/lcdc.c
@@ -611,9 +611,9 @@ static void omap_lcdc_resume(void)
 	}
 }
 
-static unsigned long omap_lcdc_get_caps(void)
+static void omap_lcdc_get_caps(int plane, struct omapfb_caps *caps)
 {
-	return 0;
+	return;
 }
 
 int omap_lcdc_set_dma_callback(void (*callback)(void *data), void *data)