| commit | 5ed836acd2c7760e03c639566b59b4c1cc53a792 | [log] [tgz] |
|---|---|---|
| author | Alan Cox <alan@linux.intel.com> | Fri Jul 08 09:43:45 2011 +0100 |
| committer | Greg Kroah-Hartman <gregkh@suse.de> | Fri Jul 08 13:44:57 2011 -0700 |
| tree | b01fb1f2c04de7db4682088f5d63317650fef10e | |
| parent | 75ec9bb006171cff72816eaffc3f5848f46944bc [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>