Merge tag 'upstream-3.11-rc1' of git://git.infradead.org/linux-ubi

[firefly-linux-kernel-4.4.55.git] / drivers / video / au1100fb.c

diff --git a/drivers/video/au1100fb.c b/drivers/video/au1100fb.c
index 700cac067b4611891af50d90ee083bdbb0f94eb9..ebeb9715f0616fd87071f4a1e6f858c65a7662f1 100644 (file)
--- 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)) {