diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-07-03 11:24:46 -0700 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2009-07-15 16:01:55 +1000 |
| commit | ba0ab82358a12e7a7f2872d6b65c437157c6888f (patch) | |
| tree | 434b13e9f81dd8cf59b7d08a8f010196a87001c0 /drivers | |
| parent | 916635bfcae5fec170ccd36f4b451cf7c5d23b9d (diff) | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 8afcf08eba98..3b54b3940178 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -1119,12 +1119,13 @@ config FB_CARILLO_RANCH config FB_INTEL tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G/945GM/965G/965GM support (EXPERIMENTAL)" - depends on EXPERIMENTAL && FB && PCI && X86 && AGP_INTEL + depends on EXPERIMENTAL && FB && PCI && X86 && AGP_INTEL && EMBEDDED select FB_MODE_HELPERS select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT select FB_BOOT_VESA_SUPPORT if FB_INTEL = y + depends on !DRM_I915 help This driver supports the on-board graphics built in to the Intel 830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM/965G/965GM chipsets. |