From 3f31018504f82c8509aa0ea1dd8a2a40f1ea73e0 Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Fri, 3 Jul 2009 11:24:46 -0700 Subject: [PATCH] --- yaml --- r: 155544 b: refs/heads/master c: ba0ab82358a12e7a7f2872d6b65c437157c6888f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/Kconfig | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c92c734e9b70..720e68592ed3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 916635bfcae5fec170ccd36f4b451cf7c5d23b9d +refs/heads/master: ba0ab82358a12e7a7f2872d6b65c437157c6888f diff --git a/trunk/drivers/video/Kconfig b/trunk/drivers/video/Kconfig index 8afcf08eba98..3b54b3940178 100644 --- a/trunk/drivers/video/Kconfig +++ b/trunk/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.