diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-09 09:58:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-09 09:58:47 -0700 |
| commit | cc14cf46da215a9df1c0a4388763a68769ef9e53 (patch) | |
| tree | f9add6f7ae53b4155a22fd8afc20c847fda021fb /drivers/char/drm/i915_drv.h | |
| parent | 4cda1fd78781c31e2a3d9dd87ee05d39cb76b3f9 (diff) | |
| parent | 8ca7c1df08210fd35fccf1559837c92baaa4da8f (diff) | |
Merge head 'drm-3264' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
Diffstat (limited to 'drivers/char/drm/i915_drv.h')
| -rw-r--r-- | drivers/char/drm/i915_drv.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/char/drm/i915_drv.h b/drivers/char/drm/i915_drv.h index fa940d64b85..3a21223267c 100644 --- a/drivers/char/drm/i915_drv.h +++ b/drivers/char/drm/i915_drv.h @@ -130,6 +130,10 @@ extern void i915_mem_takedown(struct mem_block **heap); extern void i915_mem_release(drm_device_t * dev, DRMFILE filp, struct mem_block *heap); +extern long i915_compat_ioctl(struct file *filp, unsigned int cmd, + unsigned long arg) + + #define I915_READ(reg) DRM_READ32(dev_priv->mmio_map, reg) #define I915_WRITE(reg,val) DRM_WRITE32(dev_priv->mmio_map, reg, val) #define I915_READ16(reg) DRM_READ16(dev_priv->mmio_map, reg) |