diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-07 17:43:08 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-07 17:43:08 -0500 |
| commit | 8f75015f33c3005e0bbf83ffc0d5e0b4262cc03d (patch) | |
| tree | a3c34ad86ccdc904bb43af6cd1cb163231c29276 /drivers/char/drm/i830_drv.h | |
| parent | 076d022c566fddde41fd4a858dd24bacad8304d7 (diff) | |
| parent | e060e084e7d9e1c62d02cb6b8d3fe07db5317eaa (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
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); |