From 29d997fffac0c101e046048bd311594ed69fbdb9 Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Thu, 3 Mar 2011 11:33:16 +0000 Subject: [PATCH] x86: set DRM_I915_KMS Reported-by: Julien Cristau Signed-off-by: maximilian attems svn path=/dists/trunk/linux-2.6/; revision=16977 --- debian/changelog | 1 + debian/config/kernelarch-x86/config | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5a21ab5d3..c40ef300b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ linux-2.6 (2.6.38~rc7-1~experimental.1) UNRELEASED; urgency=low [ maximilian attems ] * New upstream release candidate + * x86: Set DRM_I915_KMS on request by xorg team. -- Ben Hutchings Tue, 01 Mar 2011 05:38:48 +0000 diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index a1a92c5f2..56d1ff451 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -395,8 +395,8 @@ CONFIG_DRM_RADEON=m ## choice: Intel 830M, 845G, 852GM, 855GM, 865G # CONFIG_DRM_I830 is not set CONFIG_DRM_I915=m -# CONFIG_DRM_I915_KMS is not set ## end choice +CONFIG_DRM_I915_KMS=y CONFIG_DRM_MGA=m CONFIG_DRM_SIS=m