From: Alan Cox <alan@linux.intel.com>
Date: Fri, 8 Jul 2011 08:43:45 +0000 (+0100)
Subject: gma500: Fix symbol clash with i915
X-Git-Tag: v3.1-rc1~232^2~78
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ed836acd2c7760e03c639566b59b4c1cc53a792;p=pandora-kernel.git

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

Reading git-diff-tree failed