[kernel] r16977 - in dists/trunk/linux-2.6/debian: . config/kernelarch-x86

[Maximilian Attems]

Author: maks
Date: Thu Mar  3 11:33:16 2011
New Revision: 16977

Log:
x86: set DRM_I915_KMS

Reported-by: Julien Cristau <jcristau at debian.org>
Signed-off-by: maximilian attems <max at stro.at>

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Thu Mar  3 10:55:17 2011	(r16976)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Mar  3 11:33:16 2011	(r16977)
@@ -7,6 +7,7 @@
 
   [ maximilian attems ]
   * New upstream release candidate
+  * x86: Set DRM_I915_KMS on request by xorg team.
 
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 01 Mar 2011 05:38:48 +0000
 

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Thu Mar  3 10:55:17 2011	(r16976)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Thu Mar  3 11:33:16 2011	(r16977)
@@ -395,8 +395,8 @@
 ## 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