diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-02-02 21:51:52 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-02-02 21:51:52 -0500 |
| commit | 33052057e3e2db7f37fc78aa3f25c98f7e989fae (patch) | |
| tree | e80a3aa1371f513c833dc94a16674f78faeeeb1d /drivers/char/drm/i830_drv.h | |
| parent | 00b464debf0038b1628996065f0be564ccfbfd86 (diff) | |
| parent | 1113a7e92e483074c6235da59460759e33b9b144 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-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); |