diff options
| author | Ricardo Perez Olivares <x0081762@ti.com> | 2010-08-26 17:34:28 -0500 |
|---|---|---|
| committer | Ricardo Perez Olivares <x0081762@ti.com> | 2010-08-26 17:34:28 -0500 |
| commit | 4e90a19b1171f4779d6a7b04b6a010449c9fd328 (patch) | |
| tree | 1ea3e43c04e4de8c746fa9ff47d333f4b8781dd8 /drivers | |
| parent | 1d5c7eea56455f94ba8409d80766e8bfdc586158 (diff) | |
| parent | 1f6be6d34340f58c33f2ea90c09cb21cf0856070 (diff) | |
Merge branch 'display-next' of git://dev.omapzoom.org/pub/scm/axelcx/kernel-display into L24x9-p2
Diffstat (limited to 'drivers')
| -rwxr-xr-x | drivers/video/omap2/omapfb/omapfb-main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c index 0529bd29c7dd..54b4b90e87a4 100755 --- a/drivers/video/omap2/omapfb/omapfb-main.c +++ b/drivers/video/omap2/omapfb/omapfb-main.c @@ -1193,7 +1193,7 @@ static int omapfb_mmap(struct fb_info *fbi, struct vm_area_struct *vma) DBG("user mmap region start %lx, len %d, off %lx\n", start, len, off); - vma->vm_private_data = ofbi; + vma->vm_private_data = rg; if (ofbi->rotation_type == OMAP_DSS_ROT_TILER) { int k = 0, p = fix->line_length; |