Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / drivers / char / drm / savage_state.c

diff --git a/drivers/char/drm/savage_state.c b/drivers/char/drm/savage_state.c
index a30f4546cdb85ae9fd117f5e0d71fb1d7a0e6408..77497841478a65fcccb38d9edd2bc1b9ef46daf1 100644 (file)
--- a/drivers/char/drm/savage_state.c
+++ b/drivers/char/drm/savage_state.c
@@ -957,7 +957,7 @@ int savage_bci_cmdbuf(DRM_IOCTL_ARGS)
 {
        DRM_DEVICE;
        drm_savage_private_t *dev_priv = dev->dev_private;
-       drm_device_dma_t *dma = dev->dma;
+       struct drm_device_dma *dma = dev->dma;
        struct drm_buf *dmabuf;
        drm_savage_cmdbuf_t cmdbuf;
        drm_savage_cmd_header_t *kcmd_addr = NULL;