diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-01-16 01:59:29 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-01-16 01:59:29 +0300 |
| commit | f1dccedc8148026d9071c6805f7cb77374a9e56f (patch) | |
| tree | ba4a630084b8d21309930321ff53a6ed4381c0f3 /drivers/video/pxafb.c | |
| parent | c943aa859c392eb4cc76d911daa1f261555075b2 (diff) | |
| parent | 0238cb4e7583c521bb3538060f98a73e65f61324 (diff) | |
| download | linux-f1dccedc8148026d9071c6805f7cb77374a9e56f.tar.xz | |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/video/pxafb.c')
| -rw-r--r-- | drivers/video/pxafb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index 9fc10b9e6f57..53ad61f1038c 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c @@ -395,7 +395,7 @@ static int pxafb_blank(int blank, struct fb_info *info) return 0; } -static int pxafb_mmap(struct fb_info *info, struct file *file, +static int pxafb_mmap(struct fb_info *info, struct vm_area_struct *vma) { struct pxafb_info *fbi = (struct pxafb_info *)info; |