Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / gpu / drm / vmwgfx / vmwgfx_fifo.c

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
index 0fe31766e4cf5f11e6025e5a85f96baa5936408f..635c0ffee7fe8671945d0553ba346afe6ea565b4 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
@@ -545,7 +545,7 @@ int vmw_fifo_mmap(struct file *filp, struct vm_area_struct *vma)
        struct drm_file *file_priv;
        struct vmw_private *dev_priv;
 
-       file_priv = (struct drm_file *)filp->private_data;
+       file_priv = filp->private_data;
        dev_priv = vmw_priv(file_priv->minor->dev);
 
        if (vma->vm_pgoff != (dev_priv->mmio_start >> PAGE_SHIFT) ||