Fix warnings and make ioctl and mmap work again. Signed-off-by: Domen Puncer <domen.puncer@xxxxxxxx> drivers/video/au1200fb.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) Index: linux-2.6.16.git/drivers/video/au1200fb.c =================================================================== --- linux-2.6.16.git.orig/drivers/video/au1200fb.c +++ linux-2.6.16.git/drivers/video/au1200fb.c @@ -1246,7 +1246,7 @@ int au1200fb_fb_blank(int blank_mode, st * Map video memory in user space. We don't use the generic fb_mmap * method mainly to allow the use of the TLB streaming flag (CCA=6) */ -int au1200fb_fb_mmap(struct fb_info *fbi, struct file *file, struct vm_area_struct *vma) +int au1200fb_fb_mmap(struct fb_info *fbi, struct vm_area_struct *vma) { unsigned int len; unsigned long start=0, off; @@ -1465,8 +1465,7 @@ void get_window(unsigned int plane, au12 au_sync(); } -static int au1200fb_ioctl(struct inode *inode, struct file *file, u_int cmd, - u_long arg, struct fb_info *info) +static int au1200fb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) { int plane; int val; @@ -1763,13 +1763,13 @@ int au1200fb_drv_remove(struct device *d return 0; } -int au1200fb_drv_suspend(struct device *dev, u32 state, u32 level) +int au1200fb_drv_suspend(struct device *dev, pm_message_t state) { /* TODO */ return 0; } -int au1200fb_drv_resume(struct device *dev, u32 level) +int au1200fb_drv_resume(struct device *dev) { /* TODO */ return 0;