drm: Branch 'master'

[<kr...@ke...>]

 linux-core/drmP.h |    9 +++++++++
 shared-core/drm.h |    9 ---------
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit ff5889f8316e0c16112f114c1c8f57645b8dc54f
Author: Kristian Høgsberg <kr...@re...>
Date:   Mon Oct 29 19:32:32 2007 -0400

    Move struct drm_drawable_info out of public header file.

diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index 82a3a23..ac3ca4d 100644
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -586,6 +586,15 @@ struct drm_vbl_sig {
 	struct task_struct *task;
 };
 
+/**
+ * Drawable information.
+ */
+struct drm_drawable_info {
+	unsigned int num_rects;
+	struct drm_clip_rect *rects;
+};
+
+
 /* location of GART table */
 #define DRM_ATI_GART_MAIN 1
 #define DRM_ATI_GART_FB   2
diff --git a/shared-core/drm.h b/shared-core/drm.h
index ae88ce6..3a10273 100644
--- a/shared-core/drm.h
+++ b/shared-core/drm.h
@@ -135,14 +135,6 @@ struct drm_clip_rect {
 };
 
 /**
- * Drawable information.
- */
-struct drm_drawable_info {
-	unsigned int num_rects;
-	struct drm_clip_rect *rects;
-};
-
-/**
  * Texture region,
  */
 struct drm_tex_region {
@@ -1002,7 +994,6 @@ struct drm_mm_init_arg {
 /* typedef area */
 #if !defined(__KERNEL__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
 typedef struct drm_clip_rect drm_clip_rect_t;
-typedef struct drm_drawable_info drm_drawable_info_t;
 typedef struct drm_tex_region drm_tex_region_t;
 typedef struct drm_hw_lock drm_hw_lock_t;
 typedef struct drm_version drm_version_t;