Merge master.kernel.org:/home/rmk/linux-2.6-mmc

[linux-2.6-omap-h63xx.git] / drivers / video / sa1100fb.c

diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c
index 087e58689e4c46486bfde6331db3e6f37e8e33fe..8a893ce7040de1feae90633d46c5800c95357ef1 100644 (file)
--- a/drivers/video/sa1100fb.c
+++ b/drivers/video/sa1100fb.c
@@ -815,7 +815,7 @@ static int sa1100fb_blank(int blank, struct fb_info *info)
        return 0;
 }
 
-static int sa1100fb_mmap(struct fb_info *info, struct file *file,
+static int sa1100fb_mmap(struct fb_info *info,
                         struct vm_area_struct *vma)
 {
        struct sa1100fb_info *fbi = (struct sa1100fb_info *)info;