projects / GitHub / mt8127 / android_kernel_alcatel_ttab.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 75ec9bb) | patch
gma500: Fix symbol clash with i915
authorAlan Cox <alan@linux.intel.com>
Fri, 8 Jul 2011 08:43:45 +0000 (09:43 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 8 Jul 2011 20:44:57 +0000 (13:44 -0700)
commit5ed836acd2c7760e03c639566b59b4c1cc53a792
treeb01fb1f2c04de7db4682088f5d63317650fef10etree | snapshot (tar.gz zip)
parent75ec9bb006171cff72816eaffc3f5848f46944bccommit | diff
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>
drivers/staging/gma500/cdv_device.c diff | blob | blame | history
drivers/staging/gma500/intel_opregion.c diff | blob | blame | history
drivers/staging/gma500/psb_device.c diff | blob | blame | history
drivers/staging/gma500/psb_drv.c diff | blob | blame | history
drivers/staging/gma500/psb_drv.h diff | blob | blame | history
kernel source for telekom puls (alcatel/mediatek)