git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 2.0 rc7
[linux-2.6.git]
/
drivers
/
char
/
drm
/
i830_drv.c
diff --git
a/drivers/char/drm/i830_drv.c
b/drivers/char/drm/i830_drv.c
index
da41a97
..
aa80ad6
100644
(file)
--- a/
drivers/char/drm/i830_drv.c
+++ b/
drivers/char/drm/i830_drv.c
@@
-54,7
+54,7
@@
int postinit( struct drm_device *dev, unsigned long flags )
DRIVER_MINOR,
DRIVER_PATCHLEVEL,
DRIVER_DATE,
DRIVER_MINOR,
DRIVER_PATCHLEVEL,
DRIVER_DATE,
- dev->minor,
+ dev->
primary.
minor,
pci_pretty_name(dev->pdev)
);
return 0;
pci_pretty_name(dev->pdev)
);
return 0;
@@
-87,6
+87,7
@@
static struct drm_driver driver = {
#endif
.dev_priv_size = sizeof(drm_i830_buf_priv_t),
.pretakedown = i830_driver_pretakedown,
#endif
.dev_priv_size = sizeof(drm_i830_buf_priv_t),
.pretakedown = i830_driver_pretakedown,
+ .prerelease = i830_driver_prerelease,
.release = i830_driver_release,
.dma_quiescent = i830_driver_dma_quiescent,
.reclaim_buffers = i830_reclaim_buffers,
.release = i830_driver_release,
.dma_quiescent = i830_driver_dma_quiescent,
.reclaim_buffers = i830_reclaim_buffers,