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/i830_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/i830_drv.h')
| -rw-r--r-- | drivers/char/drm/i830_drv.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/char/drm/i830_drv.h b/drivers/char/drm/i830_drv.h index bf9075b576bd..85bc5be6f916 100644 --- a/drivers/char/drm/i830_drv.h +++ b/drivers/char/drm/i830_drv.h | |||
| @@ -123,9 +123,6 @@ typedef struct drm_i830_private { | |||
| 123 | extern drm_ioctl_desc_t i830_ioctls[]; | 123 | extern drm_ioctl_desc_t i830_ioctls[]; |
| 124 | extern int i830_max_ioctl; | 124 | extern int i830_max_ioctl; |
| 125 | 125 | ||
| 126 | /* i830_dma.c */ | ||
| 127 | extern void i830_reclaim_buffers(drm_device_t * dev, struct file *filp); | ||
| 128 | |||
| 129 | /* i830_irq.c */ | 126 | /* i830_irq.c */ |
| 130 | extern int i830_irq_emit(struct inode *inode, struct file *filp, | 127 | extern int i830_irq_emit(struct inode *inode, struct file *filp, |
| 131 | unsigned int cmd, unsigned long arg); | 128 | unsigned int cmd, unsigned long arg); |