projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
[powerpc.git]
/
drivers
/
video
/
amba-clcd.c
diff --git
a/drivers/video/amba-clcd.c
b/drivers/video/amba-clcd.c
index
0da4083
..
b218717
100644
(file)
--- a/
drivers/video/amba-clcd.c
+++ b/
drivers/video/amba-clcd.c
@@
-307,7
+307,7
@@
static int clcdfb_blank(int blank_mode, struct fb_info *info)
return 0;
}
-static int clcdfb_mmap(struct fb_info *info,
struct file *file,
+static int clcdfb_mmap(struct fb_info *info,
struct vm_area_struct *vma)
{
struct clcd_fb *fb = to_clcd(info);