Pull sbs into release branch

[linux-2.6] / drivers / char / drm / r128_drm.h

diff --git a/drivers/char/drm/r128_drm.h b/drivers/char/drm/r128_drm.h
index 5ddc03202411aea7525739a00e1fc3bb1b52b0a2..e94a39c6e3270fa94c544fc6146987151d29bf2a 100644 (file)
--- a/drivers/char/drm/r128_drm.h
+++ b/drivers/char/drm/r128_drm.h
@@ -1,6 +1,7 @@
 /* r128_drm.h -- Public header for the r128 driver -*- linux-c -*-
  * Created: Wed Apr  5 19:24:19 2000 by kevin@precisioninsight.com
- *
+ */
+/*
  * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
  * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All rights reserved.
@@ -152,7 +153,7 @@ typedef struct drm_r128_sarea {
 
        /* The current cliprects, or a subset thereof.
         */
-       drm_clip_rect_t boxes[R128_NR_SAREA_CLIPRECTS];
+       struct drm_clip_rect boxes[R128_NR_SAREA_CLIPRECTS];
        unsigned int nbox;
 
        /* Counters for client-side throttling of rendering clients.
@@ -160,7 +161,7 @@ typedef struct drm_r128_sarea {
        unsigned int last_frame;
        unsigned int last_dispatch;
 
-       drm_tex_region_t tex_list[R128_NR_TEX_HEAPS][R128_NR_TEX_REGIONS + 1];
+       struct drm_tex_region tex_list[R128_NR_TEX_HEAPS][R128_NR_TEX_REGIONS + 1];
        unsigned int tex_age[R128_NR_TEX_HEAPS];
        int ctx_owner;
        int pfAllowPageFlip;    /* number of 3d windows (0,1,2 or more) */