diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-10-06 03:10:48 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-10-06 03:10:48 +0200 |
| commit | fb7ba2114bcd8bb51640c20bc68f89164b29b9ed (patch) | |
| tree | 80b4a779130a477680a72109257fb8c19d66cf22 /drivers/gpu/drm/i810 | |
| parent | Merge remote branch 'intel/drm-intel-next' of ../drm-next into drm-core-next (diff) | |
| parent | vmwgfx: Fix fb VRAM pinning failure due to fragmentation (diff) | |
| download | linux-fb7ba2114bcd8bb51640c20bc68f89164b29b9ed.tar.xz linux-fb7ba2114bcd8bb51640c20bc68f89164b29b9ed.zip | |
Merge remote branch 'korg/drm-fixes' into drm-vmware-next
necessary for some of the vmware fixes to be pushed in.
Conflicts:
drivers/gpu/drm/drm_gem.c
drivers/gpu/drm/i915/intel_fb.c
include/drm/drmP.h
Diffstat (limited to 'drivers/gpu/drm/i810')
| -rw-r--r-- | drivers/gpu/drm/i810/i810_dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c index 61b4caf220fa..fb07e73581e8 100644 --- a/drivers/gpu/drm/i810/i810_dma.c +++ b/drivers/gpu/drm/i810/i810_dma.c @@ -116,7 +116,7 @@ static int i810_mmap_buffers(struct file *filp, struct vm_area_struct *vma) static const struct file_operations i810_buffer_fops = { .open = drm_open, .release = drm_release, - .unlocked_ioctl = drm_ioctl, + .unlocked_ioctl = i810_ioctl, .mmap = i810_mmap_buffers, .fasync = drm_fasync, }; |