Pull sbs into release branch

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

diff --git a/drivers/char/drm/via_mm.c b/drivers/char/drm/via_mm.c
index b609c48d07f232195f1b08218deaac93323f443a..85d56acd9d82e0755a2c837272c62a2931750088 100644 (file)
--- a/drivers/char/drm/via_mm.c
+++ b/drivers/char/drm/via_mm.c
@@ -127,7 +127,7 @@ int via_mem_alloc(DRM_IOCTL_ARGS)
 
        drm_via_mem_t mem;
        int retval = 0;
-       drm_memblock_item_t *item;
+       struct drm_memblock_item *item;
        drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
        unsigned long tmpSize;