summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2013-05-11 12:38:38 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-11-13 12:05:33 +0900
commita4c8ae2e72bdb85f6dfdfad82bec0df1e2749ac5 (patch)
treee2f4b9025e85acb54a5abf68a3a2feffda361305 /drivers/video
parent5fa25ee0bde3ad47e99e9877313a36a9ace95b72 (diff)
downloadlinux-stable-a4c8ae2e72bdb85f6dfdfad82bec0df1e2749ac5.tar.gz
linux-stable-a4c8ae2e72bdb85f6dfdfad82bec0df1e2749ac5.tar.bz2
linux-stable-a4c8ae2e72bdb85f6dfdfad82bec0df1e2749ac5.zip
au1100fb: VM_IO is set by io_remap_pfn_range()
commit c607f450f6e49f5794f27617bedc638b51044d2e upstream. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/au1100fb.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/video/au1100fb.c b/drivers/video/au1100fb.c
index 700cac067b46..ebeb9715f061 100644
--- a/drivers/video/au1100fb.c
+++ b/drivers/video/au1100fb.c
@@ -385,8 +385,6 @@ int au1100fb_fb_mmap(struct fb_info *fbi, struct vm_area_struct *vma)
vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
pgprot_val(vma->vm_page_prot) |= (6 << 9); //CCA=6
- vma->vm_flags |= VM_IO;
-
if (io_remap_pfn_range(vma, vma->vm_start, off >> PAGE_SHIFT,
vma->vm_end - vma->vm_start,
vma->vm_page_prot)) {