diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-02 10:49:43 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-02 10:49:43 -0500 |
| commit | cf41f8ac386e8d62122e7e394b4c6b3e3ab30ede (patch) | |
| tree | 57a286c05baa4356da2e90178c7d99122de61399 /drivers/char/drm/i810_drv.h | |
| parent | 0271fc2db6260dd46f196191e24281af2fddb879 (diff) | |
| parent | 30e2fb188194908e48d3f27a53ccea6740eb1e98 (diff) | |
Merge branch 'drm-linus' of git://git.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 | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/char/drm/i810_drv.h b/drivers/char/drm/i810_drv.h index a18b80d91920..e8cf3ff606f0 100644 --- a/drivers/char/drm/i810_drv.h +++ b/drivers/char/drm/i810_drv.h | |||
| @@ -113,8 +113,6 @@ typedef struct drm_i810_private { | |||
| 113 | } drm_i810_private_t; | 113 | } drm_i810_private_t; |
| 114 | 114 | ||
| 115 | /* i810_dma.c */ | 115 | /* i810_dma.c */ |
| 116 | extern void i810_reclaim_buffers(drm_device_t * dev, struct file *filp); | ||
| 117 | |||
| 118 | extern int i810_driver_dma_quiescent(drm_device_t * dev); | 116 | extern int i810_driver_dma_quiescent(drm_device_t * dev); |
| 119 | extern void i810_driver_reclaim_buffers_locked(drm_device_t * dev, | 117 | extern void i810_driver_reclaim_buffers_locked(drm_device_t * dev, |
| 120 | struct file *filp); | 118 | struct file *filp); |