From: Dirk Behme Date: Fri, 20 Jan 2006 19:02:41 +0000 (-0800) Subject: ARM: OMAP: Fix warning because of changed ioctl() parameters X-Git-Tag: v2.6.16-omap1~120 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=9a1914c68ffce32151dfb2af643965e6fd0effa9;p=linux-2.6-omap-h63xx.git ARM: OMAP: Fix warning because of changed ioctl() parameters drivers/video/omap/omapfb_main.c:877: warning: initialization from incompatible pointer type Signed-off-by: Dirk Behme Signed-off-by: Tony Lindgren --- diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c index ed5aa4cb206..466b30612be 100644 --- a/drivers/video/omap/omapfb_main.c +++ b/drivers/video/omap/omapfb_main.c @@ -743,9 +743,8 @@ EXPORT_SYMBOL(omapfb_write_first_pixel); * graphics transformations, frame flipping support is provided through this * interface. */ -static int omapfb_ioctl(struct inode *inode, struct file *file, - unsigned int cmd, unsigned long arg, - struct fb_info *fbi) +static int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, + unsigned long arg) { struct omapfb_device *fbdev = (struct omapfb_device *)fbi->par; struct fb_ops *ops = fbi->fbops;