git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
mga
/
mga_drv.c
diff --git
a/drivers/gpu/drm/mga/mga_drv.c
b/drivers/gpu/drm/mga/mga_drv.c
index 97ee566ef7492468ecb4c2489b5644d74f5cd5af..ddfe16197b59336e6d9c874e9e1b855a8222c430 100644
(file)
--- a/
drivers/gpu/drm/mga/mga_drv.c
+++ b/
drivers/gpu/drm/mga/mga_drv.c
@@
-68,7
+68,7
@@
static struct drm_driver driver = {
.owner = THIS_MODULE,
.open = drm_open,
.release = drm_release,
- .ioctl = drm_ioctl,
+ .
unlocked_
ioctl = drm_ioctl,
.mmap = drm_mmap,
.poll = drm_poll,
.fasync = drm_fasync,