diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-30 07:45:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-30 07:45:15 -0700 |
| commit | 3cb904caa97f5c193df21b8cdf780a826564baff (patch) | |
| tree | d154725dbf0a7f74a7c0190c9748304ce7885678 /drivers/char/drm/i810_drv.h | |
| parent | d8971fcb702e24d1e22c77fd1772f182ffee87e3 (diff) | |
| parent | 7a9aff3cff807261e476a1719273a4ac5d254ecb (diff) | |
| download | lwn-3cb904caa97f5c193df21b8cdf780a826564baff.tar.gz lwn-3cb904caa97f5c193df21b8cdf780a826564baff.zip | |
Merge refs/heads/drm-latest from master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
Diffstat (limited to 'drivers/char/drm/i810_drv.h')
| -rw-r--r-- | drivers/char/drm/i810_drv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/drm/i810_drv.h b/drivers/char/drm/i810_drv.h index 1b40538d1725..62ee4f58c59a 100644 --- a/drivers/char/drm/i810_drv.h +++ b/drivers/char/drm/i810_drv.h @@ -120,6 +120,7 @@ extern int i810_driver_dma_quiescent(drm_device_t *dev); extern void i810_driver_release(drm_device_t *dev, struct file *filp); extern void i810_driver_pretakedown(drm_device_t *dev); extern void i810_driver_prerelease(drm_device_t *dev, DRMFILE filp); +extern int i810_driver_device_is_agp(drm_device_t * dev); #define I810_BASE(reg) ((unsigned long) \ dev_priv->mmio_map->handle) |