diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-10-31 05:06:46 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-10-31 05:06:46 -0500 |
| commit | 1f04c0a24b2f3cfe89c802a24396263623e3512d (patch) | |
| tree | d7e2216b6e65b833c0c2b79b478d13ce17dbf296 /drivers/video/fbmem.c | |
| parent | 07b188ab773e183871e57b33ae37bf635c9f12ba (diff) | |
| parent | e2f2e58e7968f8446b1078a20a18bf8ea12b4fbc (diff) | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'drivers/video/fbmem.c')
| -rw-r--r-- | drivers/video/fbmem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index 9073be4221a8..e2667ddab3f1 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c | |||
| @@ -918,7 +918,7 @@ fb_mmap(struct file *file, struct vm_area_struct * vma) | |||
| 918 | } | 918 | } |
| 919 | #endif | 919 | #endif |
| 920 | #elif defined(__powerpc__) | 920 | #elif defined(__powerpc__) |
| 921 | vma->vm_page_prot = phys_mem_access_prot(file, off, | 921 | vma->vm_page_prot = phys_mem_access_prot(file, off >> PAGE_SHIFT, |
| 922 | vma->vm_end - vma->vm_start, | 922 | vma->vm_end - vma->vm_start, |
| 923 | vma->vm_page_prot); | 923 | vma->vm_page_prot); |
| 924 | #elif defined(__alpha__) | 924 | #elif defined(__alpha__) |