diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-09 12:58:47 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-09 12:58:47 -0400 |
| commit | cc14cf46da215a9df1c0a4388763a68769ef9e53 (patch) | |
| tree | f9add6f7ae53b4155a22fd8afc20c847fda021fb /drivers/char/drm/r128_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/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 cf1aa5df459e..0fb687c9505e 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 ); | |||
| 156 | extern void r128_driver_pretakedown(drm_device_t *dev); | 156 | extern void r128_driver_pretakedown(drm_device_t *dev); |
| 157 | extern void r128_driver_prerelease(drm_device_t *dev, DRMFILE filp); | 157 | extern void r128_driver_prerelease(drm_device_t *dev, DRMFILE filp); |
| 158 | 158 | ||
| 159 | extern long r128_compat_ioctl(struct file *filp, unsigned int cmd, | ||
| 160 | unsigned long arg); | ||
| 161 | |||
| 159 | /* Register definitions, register access macros and drmAddMap constants | 162 | /* Register definitions, register access macros and drmAddMap constants |
| 160 | * for Rage 128 kernel driver. | 163 | * for Rage 128 kernel driver. |
| 161 | */ | 164 | */ |