git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
i810
/
i810_dma.c
diff --git
a/drivers/gpu/drm/i810/i810_dma.c
b/drivers/gpu/drm/i810/i810_dma.c
index
61b4caf
..
fb07e73
100644
(file)
--- 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,
};