OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Alan Cox 2011-07-08 09:43:45 +01:00 committed by Greg Kroah-Hartman
parent 75ec9bb006
commit 5ed836acd2
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/gma500/cdv_device.c
View File

@ -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;
}

4
drivers/staging/gma500/intel_opregion.c
View File

@ -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)

2
drivers/staging/gma500/psb_device.c
View File

@ -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;
}

2
drivers/staging/gma500/psb_drv.c
View File

@ -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);

4
drivers/staging/gma500/psb_drv.h
View File

@ -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