From 802512bcbe8a6217f61ecc986ae99943ca41fd5d Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Sun, 21 Mar 2010 04:19:15 +0000 Subject: [PATCH] x86 disable FB_INTEL highly deprecated these days with KMS. svn path=/dists/sid/linux-2.6/; revision=15432 --- debian/changelog | 1 + debian/config/config | 2 +- debian/config/kernelarch-x86/config | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c77cc1ae7..d6fe53224 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ linux-2.6 (2.6.32-11) UNRELEASED; urgency=low * [alpha, hppa] Disable oprofile as tracing code is unsupported here. (closes: #574368) * Update openvz patch to 026c0e96af23. + * [x86]: Disable FB_INTEL. (closes: #574401) -- maximilian attems Wed, 17 Mar 2010 18:48:22 +0100 diff --git a/debian/config/config b/debian/config/config index fd57c67df..9c68ab47f 100644 --- a/debian/config/config +++ b/debian/config/config @@ -2526,7 +2526,7 @@ CONFIG_FB_ARC=m # CONFIG_FB_UVESA is not set # CONFIG_FB_NVIDIA_DEBUG is not set # CONFIG_FB_INTEL_DEBUG is not set -CONFIG_FB_INTEL_I2C=y +# CONFIG_FB_INTEL_I2C is not set CONFIG_FB_S3=m CONFIG_FB_VIA=m CONFIG_FB_3DFX=m diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index dc19827c7..293542f41 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -1227,7 +1227,7 @@ CONFIG_FB_NVIDIA_BACKLIGHT=y # CONFIG_FB_RIVA_DEBUG is not set CONFIG_FB_LE80578=m CONFIG_FB_CARILLO_RANCH=m -CONFIG_FB_INTEL=m +# CONFIG_FB_INTEL is not set CONFIG_FB_MATROX=m CONFIG_FB_MATROX_MILLENIUM=y CONFIG_FB_MATROX_MYSTIQUE=y