[kernel] r13068 - in dists/trunk/linux-2.6/debian: . config/amd64 config/i386

[Maximilian Attems]

Author: maks
Date: Mon Mar  9 16:37:08 2009
New Revision: 13068

Log:
[x86] unset DRM_I915_KMS

"Running old userspaces with this enabled will cause pain."
as we have to upgrade from Lenny this can be enabled postlenny

can be overriden with module param modeset!

Acked-by: Julien Cristau <jcristau at debian.org>

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/amd64/config
   dists/trunk/linux-2.6/debian/config/i386/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Mar  9 16:37:08 2009
@@ -31,6 +31,8 @@
   * topconfig enable SND_HDA_HWDEP for sound debugging purpose.
   * topconfig enable USB_HIDDEV (closes: #517771)
   * [x86] set DELL_LAPTOP.
+  * [x86] unset DRM_I915_KMS due to upgrade path from Lenny override with
+    modeset module param.
 
   [ Bastian Blank ]
   * Use external source directory for all builds.

Modified: dists/trunk/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config	(original)
+++ dists/trunk/linux-2.6/debian/config/amd64/config	Mon Mar  9 16:37:08 2009
@@ -298,7 +298,7 @@
 CONFIG_AGP_VIA=m
 
 ##
-## file: drivers/char/drm/Kconfig
+## file: drivers/gpu/drm/Kconfig
 ##
 CONFIG_DRM=m
 CONFIG_DRM_TDFX=m
@@ -309,6 +309,7 @@
 CONFIG_DRM_I830=m
 CONFIG_DRM_I915=m
 ## end choice
+# CONFIG_DRM_I915_KMS is not set
 CONFIG_DRM_MGA=m
 CONFIG_DRM_SIS=m
 

Modified: dists/trunk/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config	(original)
+++ dists/trunk/linux-2.6/debian/config/i386/config	Mon Mar  9 16:37:08 2009
@@ -382,7 +382,7 @@
 CONFIG_AGP_EFFICEON=m
 
 ##
-## file: drivers/char/drm/Kconfig
+## file: drivers/gpu/drm/Kconfig
 ##
 CONFIG_DRM=m
 CONFIG_DRM_TDFX=m
@@ -393,6 +393,7 @@
 CONFIG_DRM_I830=m
 CONFIG_DRM_I915=m
 ## end choice
+# CONFIG_DRM_I915_KMS is not set
 CONFIG_DRM_MGA=m
 CONFIG_DRM_SIS=m