From decc835efda820303d8f14d3f6ba7d4d82c94d32 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Wed, 16 Nov 2011 22:39:45 +0000
Subject: [PATCH] --- yaml --- r: 282455 b: refs/heads/master c:
 838fa588a29331da012876623c3bc170d7d647c2 h: refs/heads/master i:   282453:
 152eb0c0c050dc3a0b68895c6f4ee198b354d8f9   282451:
 f705d3986d1002ce4a1bcc43c366bca30dc4b38f   282447:
 d0c022f57b9809ee4aeed7a5caa0b851f37da8fc v: v3

---
 [refs]                                                          | 2 +-
 trunk/drivers/gpu/drm/gma500/cdv_device.c                       | 2 +-
 trunk/drivers/gpu/drm/gma500/gem.c                              | 2 +-
 trunk/drivers/gpu/drm/gma500/intel_bios.c                       | 2 +-
 trunk/drivers/gpu/drm/gma500/mid_bios.c                         | 2 +-
 trunk/drivers/gpu/drm/gma500/oaktrail_device.c                  | 2 +-
 trunk/drivers/gpu/drm/gma500/psb_device.c                       | 2 +-
 trunk/drivers/gpu/drm/gma500/psb_drv.c                          | 2 +-
 trunk/drivers/gpu/drm/gma500/psb_drv.h                          | 2 +-
 .../{drivers/gpu/drm/gma500/psb_drm.h => include/drm/gma_drm.h} | 0
 10 files changed, 9 insertions(+), 9 deletions(-)
 rename trunk/{drivers/gpu/drm/gma500/psb_drm.h => include/drm/gma_drm.h} (100%)

diff --git a/[refs] b/[refs]
index 562d12a990ee..df1c4e3c40fd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04bd564fdb3cbea09d14a271b4f2d616cc8eac90
+refs/heads/master: 838fa588a29331da012876623c3bc170d7d647c2
diff --git a/trunk/drivers/gpu/drm/gma500/cdv_device.c b/trunk/drivers/gpu/drm/gma500/cdv_device.c
index 87614e0d396a..c0583dfc6d72 100644
--- a/trunk/drivers/gpu/drm/gma500/cdv_device.c
+++ b/trunk/drivers/gpu/drm/gma500/cdv_device.c
@@ -20,7 +20,7 @@
 #include <linux/backlight.h>
 #include <drm/drmP.h>
 #include <drm/drm.h>
-#include "psb_drm.h"
+#include "gma_drm.h"
 #include "psb_drv.h"
 #include "psb_reg.h"
 #include "psb_intel_reg.h"
diff --git a/trunk/drivers/gpu/drm/gma500/gem.c b/trunk/drivers/gpu/drm/gma500/gem.c
index d74367993989..fdc8b5dee720 100644
--- a/trunk/drivers/gpu/drm/gma500/gem.c
+++ b/trunk/drivers/gpu/drm/gma500/gem.c
@@ -25,7 +25,7 @@
 
 #include <drm/drmP.h>
 #include <drm/drm.h>
-#include "psb_drm.h"
+#include "gma_drm.h"
 #include "psb_drv.h"
 
 int psb_gem_init_object(struct drm_gem_object *obj)
diff --git a/trunk/drivers/gpu/drm/gma500/intel_bios.c b/trunk/drivers/gpu/drm/gma500/intel_bios.c
index 096757f9bc89..d4d0c5b8bf91 100644
--- a/trunk/drivers/gpu/drm/gma500/intel_bios.c
+++ b/trunk/drivers/gpu/drm/gma500/intel_bios.c
@@ -20,7 +20,7 @@
  */
 #include <drm/drmP.h>
 #include <drm/drm.h>
-#include "psb_drm.h"
+#include "gma_drm.h"
 #include "psb_drv.h"
 #include "psb_intel_drv.h"
 #include "psb_intel_reg.h"
diff --git a/trunk/drivers/gpu/drm/gma500/mid_bios.c b/trunk/drivers/gpu/drm/gma500/mid_bios.c
index 7115d1a7408f..018ab469772e 100644
--- a/trunk/drivers/gpu/drm/gma500/mid_bios.c
+++ b/trunk/drivers/gpu/drm/gma500/mid_bios.c
@@ -25,7 +25,7 @@
 
 #include <drm/drmP.h>
 #include <drm/drm.h>
-#include "psb_drm.h"
+#include "gma_drm.h"
 #include "psb_drv.h"
 #include "mid_bios.h"
 
diff --git a/trunk/drivers/gpu/drm/gma500/oaktrail_device.c b/trunk/drivers/gpu/drm/gma500/oaktrail_device.c
index 41c418fa9aee..57ad3ea62be2 100644
--- a/trunk/drivers/gpu/drm/gma500/oaktrail_device.c
+++ b/trunk/drivers/gpu/drm/gma500/oaktrail_device.c
@@ -22,7 +22,7 @@
 #include <linux/dmi.h>
 #include <drm/drmP.h>
 #include <drm/drm.h>
-#include "psb_drm.h"
+#include "gma_drm.h"
 #include "psb_drv.h"
 #include "psb_reg.h"
 #include "psb_intel_reg.h"
diff --git a/trunk/drivers/gpu/drm/gma500/psb_device.c b/trunk/drivers/gpu/drm/gma500/psb_device.c
index 46591323595a..9d6959aa8555 100644
--- a/trunk/drivers/gpu/drm/gma500/psb_device.c
+++ b/trunk/drivers/gpu/drm/gma500/psb_device.c
@@ -20,7 +20,7 @@
 #include <linux/backlight.h>
 #include <drm/drmP.h>
 #include <drm/drm.h>
-#include "psb_drm.h"
+#include "gma_drm.h"
 #include "psb_drv.h"
 #include "psb_reg.h"
 #include "psb_intel_reg.h"
diff --git a/trunk/drivers/gpu/drm/gma500/psb_drv.c b/trunk/drivers/gpu/drm/gma500/psb_drv.c
index 062df075a717..4a72747e8602 100644
--- a/trunk/drivers/gpu/drm/gma500/psb_drv.c
+++ b/trunk/drivers/gpu/drm/gma500/psb_drv.c
@@ -21,7 +21,7 @@
 
 #include <drm/drmP.h>
 #include <drm/drm.h>
-#include "psb_drm.h"
+#include "gma_drm.h"
 #include "psb_drv.h"
 #include "framebuffer.h"
 #include "psb_reg.h"
diff --git a/trunk/drivers/gpu/drm/gma500/psb_drv.h b/trunk/drivers/gpu/drm/gma500/psb_drv.h
index ffb05f2c79e1..5e6171ab8824 100644
--- a/trunk/drivers/gpu/drm/gma500/psb_drv.h
+++ b/trunk/drivers/gpu/drm/gma500/psb_drv.h
@@ -25,7 +25,7 @@
 #include <drm/drmP.h>
 #include "drm_global.h"
 #include "gem_glue.h"
-#include "psb_drm.h"
+#include "gma_drm.h"
 #include "psb_reg.h"
 #include "psb_intel_drv.h"
 #include "gtt.h"
diff --git a/trunk/drivers/gpu/drm/gma500/psb_drm.h b/trunk/include/drm/gma_drm.h
similarity index 100%
rename from trunk/drivers/gpu/drm/gma500/psb_drm.h
rename to trunk/include/drm/gma_drm.h