diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-13 15:25:59 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-13 15:25:59 +0100 |
| commit | 30beab1491f0b96b2f23d3fb68af01fd921a16d8 (patch) | |
| tree | c580bdc0846269fbb10feeda901ecec1a48ee2ef /drivers/char/drm/i830_dma.c | |
| parent | 21af6c4f2aa5f63138871b4ddd77d7ebf2588c9d (diff) | |
| parent | c32511e2718618f0b53479eb36e07439aa363a74 (diff) | |
| download | kernel_samsung_smdk4412-30beab1491f0b96b2f23d3fb68af01fd921a16d8.zip kernel_samsung_smdk4412-30beab1491f0b96b2f23d3fb68af01fd921a16d8.tar.gz kernel_samsung_smdk4412-30beab1491f0b96b2f23d3fb68af01fd921a16d8.tar.bz2 | |
Merge with /shiny/git/linux-2.6/.git
Diffstat (limited to 'drivers/char/drm/i830_dma.c')
| -rw-r--r-- | drivers/char/drm/i830_dma.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/char/drm/i830_dma.c b/drivers/char/drm/i830_dma.c index 98adccf..dc77330 100644 --- a/drivers/char/drm/i830_dma.c +++ b/drivers/char/drm/i830_dma.c @@ -92,16 +92,7 @@ static int i830_freelist_put(drm_device_t *dev, drm_buf_t *buf) return 0; } -static struct file_operations i830_buffer_fops = { - .open = drm_open, - .flush = drm_flush, - .release = drm_release, - .ioctl = drm_ioctl, - .mmap = i830_mmap_buffers, - .fasync = drm_fasync, -}; - -int i830_mmap_buffers(struct file *filp, struct vm_area_struct *vma) +static int i830_mmap_buffers(struct file *filp, struct vm_area_struct *vma) { drm_file_t *priv = filp->private_data; drm_device_t *dev; @@ -128,6 +119,15 @@ int i830_mmap_buffers(struct file *filp, struct vm_area_struct *vma) return 0; } +static struct file_operations i830_buffer_fops = { + .open = drm_open, + .flush = drm_flush, + .release = drm_release, + .ioctl = drm_ioctl, + .mmap = i830_mmap_buffers, + .fasync = drm_fasync, +}; + static int i830_map_buffer(drm_buf_t *buf, struct file *filp) { drm_file_t *priv = filp->private_data; |