From 8d2d44bc0837536041ecd0a82c1859cde7a78a60 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Fri, 8 Jul 2011 09:43:45 +0100
Subject: [PATCH] --- yaml --- r: 260005 b: refs/heads/master c:
 5ed836acd2c7760e03c639566b59b4c1cc53a792 h: refs/heads/master i:   260003:
 3835a7aa0b9a8a0b0d46f1f52ef95246ca392f20 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/staging/gma500/cdv_device.c     | 2 +-
 trunk/drivers/staging/gma500/intel_opregion.c | 4 ++--
 trunk/drivers/staging/gma500/psb_device.c     | 2 +-
 trunk/drivers/staging/gma500/psb_drv.c        | 2 +-
 trunk/drivers/staging/gma500/psb_drv.h        | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index e7c301cd427e..abfd9a60500a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75ec9bb006171cff72816eaffc3f5848f46944bc
+refs/heads/master: 5ed836acd2c7760e03c639566b59b4c1cc53a792
diff --git a/trunk/drivers/staging/gma500/cdv_device.c b/trunk/drivers/staging/gma500/cdv_device.c
index 680f1bbf0766..3729a97f2327 100644
--- a/trunk/drivers/staging/gma500/cdv_device.c
+++ b/trunk/drivers/staging/gma500/cdv_device.c
@@ -319,7 +319,7 @@ static void cdv_get_core_freq(struct drm_device *dev)
 static int cdv_chip_setup(struct drm_device *dev)
 {
 	cdv_get_core_freq(dev);
-	intel_opregion_init(dev);
+	gma_intel_opregion_init(dev);
 	psb_intel_init_bios(dev);
 	return 0;
 }
diff --git a/trunk/drivers/staging/gma500/intel_opregion.c b/trunk/drivers/staging/gma500/intel_opregion.c
index 824096510d4a..d2e60376982f 100644
--- a/trunk/drivers/staging/gma500/intel_opregion.c
+++ b/trunk/drivers/staging/gma500/intel_opregion.c
@@ -47,7 +47,7 @@ struct opregion_acpi {
 	/*FIXME: add it later*/
 } __packed;
 
-int intel_opregion_init(struct drm_device *dev)
+int gma_intel_opregion_init(struct drm_device *dev)
 {
 	struct drm_psb_private *dev_priv = dev->dev_private;
 	u32 opregion_phy;
@@ -71,7 +71,7 @@ int intel_opregion_init(struct drm_device *dev)
 	return 0;
 }
 
-int intel_opregion_exit(struct drm_device *dev)
+int gma_intel_opregion_exit(struct drm_device *dev)
 {
 	struct drm_psb_private *dev_priv = dev->dev_private;
 	if (dev_priv->lid_state)
diff --git a/trunk/drivers/staging/gma500/psb_device.c b/trunk/drivers/staging/gma500/psb_device.c
index 0774c06782e9..e26a176ad26e 100644
--- a/trunk/drivers/staging/gma500/psb_device.c
+++ b/trunk/drivers/staging/gma500/psb_device.c
@@ -322,7 +322,7 @@ static void psb_get_core_freq(struct drm_device *dev)
 static int psb_chip_setup(struct drm_device *dev)
 {
 	psb_get_core_freq(dev);
-	intel_opregion_init(dev);
+	gma_intel_opregion_init(dev);
 	psb_intel_init_bios(dev);
 	return 0;
 }
diff --git a/trunk/drivers/staging/gma500/psb_drv.c b/trunk/drivers/staging/gma500/psb_drv.c
index 264fdf4c7a8c..397b6051e546 100644
--- a/trunk/drivers/staging/gma500/psb_drv.c
+++ b/trunk/drivers/staging/gma500/psb_drv.c
@@ -245,7 +245,7 @@ static int psb_driver_unload(struct drm_device *dev)
 
 	if (dev_priv) {
 		psb_lid_timer_takedown(dev_priv);
-		intel_opregion_exit(dev);
+		gma_intel_opregion_exit(dev);
 
 		psb_do_takedown(dev);
 
diff --git a/trunk/drivers/staging/gma500/psb_drv.h b/trunk/drivers/staging/gma500/psb_drv.h
index c19045f38812..f5ecd6d16be5 100644
--- a/trunk/drivers/staging/gma500/psb_drv.h
+++ b/trunk/drivers/staging/gma500/psb_drv.h
@@ -728,8 +728,8 @@ extern void mdfld_disable_te(struct drm_device *dev, int pipe);
 /*
  * intel_opregion.c
  */
-extern int intel_opregion_init(struct drm_device *dev);
-extern int intel_opregion_exit(struct drm_device *dev);
+extern int gma_intel_opregion_init(struct drm_device *dev);
+extern int gma_intel_opregion_exit(struct drm_device *dev);
 
 /*
  * framebuffer.c