4 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/unichrome/server/via_dri.c b/src/mesa/drivers/dri/unichrome/server/via_dri.c
index 0a6c8c04cab..381f493b7ae 100644
--- a/src/mesa/drivers/dri/unichrome/server/via_dri.c
+++ b/src/mesa/drivers/dri/unichrome/server/via_dri.c
@@ -131,7 +131,7 @@ static int VIADRIAgpInit(const DRIDriverContext *ctx, VIAPtr pVia)
                  "[drm] agpAddr = 0x%08lx\n",pVia->agpAddr);
 		 
     pVIADRI->agp.size = pVia->agpSize;
-    if (drmAddMap(pVia->drmFD, (drmHandle)0,
+    if (drmAddMap(pVia->drmFD, (drm_handle_t)0,
                  pVIADRI->agp.size, DRM_AGP, 0, 
                  &pVIADRI->agp.handle) < 0) {
 	xf86DrvMsg(pScreen->myNum, X_ERROR,
@@ -237,7 +237,7 @@ static int VIADRIScreenInit(DRIDriverContext * ctx)
     /* Need to AddMap the framebuffer and mmio regions here:
      */
     if (drmAddMap(ctx->drmFD,
-                  (drmHandle)ctx->FBStart,
+                  (drm_handle_t)ctx->FBStart,
                   ctx->FBSize,
                   DRM_FRAME_BUFFER,
 #ifndef _EMBEDDED
diff --git a/src/mesa/drivers/dri/unichrome/via_context.h b/src/mesa/drivers/dri/unichrome/via_context.h
index 25d9325288f..fe26ff80d3a 100644
--- a/src/mesa/drivers/dri/unichrome/via_context.h
+++ b/src/mesa/drivers/dri/unichrome/via_context.h
@@ -97,7 +97,7 @@ typedef void (*via_line_func)(viaContextPtr, viaVertex *, viaVertex *);
 typedef void (*via_point_func)(viaContextPtr, viaVertex *);
 
 typedef struct {
-    drmHandle handle;
+    drm_handle_t handle;
     drmSize size;
     GLuint offset;
     GLuint index;
@@ -107,7 +107,7 @@ typedef struct {
 } viaBuffer, *viaBufferPtr;
 
 typedef struct {
-    drmHandle handle;
+    drm_handle_t handle;
     drmSize size;
     GLuint offset;
     GLuint index;
@@ -288,7 +288,7 @@ struct via_context_t {
     drm_clip_rect_t drawRect;
     drm_clip_rect_t scissorRect;
 
-    drmContext hHWContext;
+    drm_context_t hHWContext;
     drm_hw_lock_t *driHwLock;
     int driFd;
 #ifndef _SOLO
diff --git a/src/mesa/drivers/dri/unichrome/via_dri.h b/src/mesa/drivers/dri/unichrome/via_dri.h
index 9c17cf6b1d8..6a0331424d1 100644
--- a/src/mesa/drivers/dri/unichrome/via_dri.h
+++ b/src/mesa/drivers/dri/unichrome/via_dri.h
@@ -13,7 +13,7 @@ typedef struct {
 } VIASAREAPriv;
 
 typedef struct {
-    drmHandle handle;
+    drm_handle_t handle;
     drmSize size;
     drmAddress map;
 } viaRegion, *viaRegionPtr;
diff --git a/src/mesa/drivers/dri/unichrome/xf86drmVIA.c b/src/mesa/drivers/dri/unichrome/xf86drmVIA.c
index e39bdf745f1..8954d8e208c 100644
--- a/src/mesa/drivers/dri/unichrome/xf86drmVIA.c
+++ b/src/mesa/drivers/dri/unichrome/xf86drmVIA.c
@@ -121,7 +121,7 @@ int drmVIAAllocateDMA(int fd, drmVIADMABuf *buf)
 		return -errno;
     }
     
-    if (drmMap(fd,(drmHandle)buf->index,
+    if (drmMap(fd,(drm_handle_t)buf->index,
 		buf->size,(drmAddressPtr)(&buf->address)) < 0) {
 	return -errno;
     }