From: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Fri, 3 Jul 2009 18:24:46 +0000 (-0700)
Subject: fb/intelfb: conflict with DRM_I915 and hide by default
X-Git-Tag: v2.6.31-rc4~29^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba0ab82358a12e7a7f2872d6b65c437157c6888f;p=pandora-kernel.git

fb/intelfb: conflict with DRM_I915 and hide by default

Users get confused by this driver.  It's really a special purpose
embedded driver, and causes a lot of problems if enabled.  So hide it
under EMBEDDED by default, and make sure it doesn't get enabled with
the i915 DRM driver.

Dave, I'm hoping you can feed this to Linus through your tree.  It's
appropriate for 2.6.31 I think.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Dave Airlie <airlied@linux.ie>
---

Reading git-diff-tree failed