gma500: Fix symbol clash with i915

Randy Dunlap reports: | when both CONFIG_DRM_I915=y and CONFIG_DRM_PSB=y: | drivers/staging/built-in.o: In function `intel_opregion_init': | (.text+0x47943): multiple definition of `intel_opregion_init' | drivers/gpu/built-in.o:(.text+0x17277a): first defined here Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
git-mirror · Jul 8, 2011 · 5ed836a · 5ed836a
1 parent 75ec9bb
commit 5ed836a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/drivers/staging/gma500/cdv_device.c b/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/drivers/staging/gma500/intel_opregion.c b/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/drivers/staging/gma500/psb_device.c b/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/drivers/staging/gma500/psb_drv.c b/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/drivers/staging/gma500/psb_drv.h b/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