Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit 5ed836ac authored Jul 08, 2011 by Alan Cox Committed by Greg Kroah-Hartman Jul 08, 2011

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>

parent 75ec9bb0

drivers/staging/gma500/cdv_device.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

drivers/staging/gma500/intel_opregion.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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)

drivers/staging/gma500/psb_device.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

drivers/staging/gma500/psb_drv.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

drivers/staging/gma500/psb_drv.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -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