diff options
author | Tony Luck <tony.luck@intel.com> | 2005-07-11 09:43:11 -0700 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-07-11 09:43:11 -0700 |
commit | e7578c08a4dee36fe01fb38805f325689e642eb0 (patch) | |
tree | 7426054f6226aa2349ee0c0a3970aeef9276ea59 /drivers/char/drm/r128_drv.h | |
parent | 763b3917e779c9c25d56fc71a796774185cd6ce2 (diff) | |
parent | 5c23804a0941a111752fdacefe0bea2db1b4d93f (diff) |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/char/drm/r128_drv.h')
-rw-r--r-- | drivers/char/drm/r128_drv.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/char/drm/r128_drv.h b/drivers/char/drm/r128_drv.h index cf1aa5df459..0fb687c9505 100644 --- a/drivers/char/drm/r128_drv.h +++ b/drivers/char/drm/r128_drv.h @@ -156,6 +156,9 @@ extern void r128_driver_irq_uninstall( drm_device_t *dev ); extern void r128_driver_pretakedown(drm_device_t *dev); extern void r128_driver_prerelease(drm_device_t *dev, DRMFILE filp); +extern long r128_compat_ioctl(struct file *filp, unsigned int cmd, + unsigned long arg); + /* Register definitions, register access macros and drmAddMap constants * for Rage 128 kernel driver. */ |