summaryrefslogtreecommitdiff
path: root/drivers/char/drm/i830_drv.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-08-30 18:45:15 +0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-30 18:45:15 +0400
commit3cb904caa97f5c193df21b8cdf780a826564baff (patch)
treed154725dbf0a7f74a7c0190c9748304ce7885678 /drivers/char/drm/i830_drv.c
parentd8971fcb702e24d1e22c77fd1772f182ffee87e3 (diff)
parent7a9aff3cff807261e476a1719273a4ac5d254ecb (diff)
downloadlinux-3cb904caa97f5c193df21b8cdf780a826564baff.tar.xz
Merge refs/heads/drm-latest from master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
Diffstat (limited to 'drivers/char/drm/i830_drv.c')
-rw-r--r--drivers/char/drm/i830_drv.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/drm/i830_drv.c b/drivers/char/drm/i830_drv.c
index bc36be76b8b2..0da9cd19919e 100644
--- a/drivers/char/drm/i830_drv.c
+++ b/drivers/char/drm/i830_drv.c
@@ -88,6 +88,7 @@ static struct drm_driver driver = {
.dev_priv_size = sizeof(drm_i830_buf_priv_t),
.pretakedown = i830_driver_pretakedown,
.prerelease = i830_driver_prerelease,
+ .device_is_agp = i830_driver_device_is_agp,
.release = i830_driver_release,
.dma_quiescent = i830_driver_dma_quiescent,
.reclaim_buffers = i830_reclaim_buffers,