diff options
| author | Alan Cox <alan@linux.intel.com> | 2011-07-08 09:43:45 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-08 13:44:57 -0700 |
| commit | 5ed836acd2c7760e03c639566b59b4c1cc53a792 (patch) | |
| tree | b01fb1f2c04de7db4682088f5d63317650fef10e /drivers/staging/gma500/cdv_device.c | |
| parent | 75ec9bb006171cff72816eaffc3f5848f46944bc (diff) | |
| download | op-kernel-dev-5ed836acd2c7760e03c639566b59b4c1cc53a792.zip op-kernel-dev-5ed836acd2c7760e03c639566b59b4c1cc53a792.tar.gz | |
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>
Diffstat (limited to 'drivers/staging/gma500/cdv_device.c')
| -rw-r--r-- | drivers/staging/gma500/cdv_device.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/gma500/cdv_device.c b/drivers/staging/gma500/cdv_device.c index 680f1bb..3729a97 100644 --- 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; } |
