[pve-devel] r6325 - pve-kernel-2.6.32-rh/pve2

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-07-19 11:53:57 +0200 (Tue, 19 Jul 2011)
New Revision: 6325

Modified:
   pve-kernel-2.6.32-rh/pve2/changelog.Debian
   pve-kernel-2.6.32-rh/pve2/config-2.6.32.diff
Log:
  * enable CONFIG_DRM_RADEON_KMS and CONFIG_DRM_I915_KMS again, seems X11
    needs that.



Modified: pve-kernel-2.6.32-rh/pve2/changelog.Debian
===================================================================
--- pve-kernel-2.6.32-rh/pve2/changelog.Debian	2011-07-19 08:40:16 UTC (rev 6324)
+++ pve-kernel-2.6.32-rh/pve2/changelog.Debian	2011-07-19 09:53:57 UTC (rev 6325)
@@ -1,6 +1,9 @@
 pve-kernel-2.6.32 (2.6.32-38) unstable; urgency=low
 
   * update to vzkernel-2.6.32-042stab021.1.src.rpm
+
+  * enable CONFIG_DRM_RADEON_KMS and CONFIG_DRM_I915_KMS again, seems X11
+    needs that.
   
   * remove ovz-fix-slow-fsync.patch (already in upstream)
 

Modified: pve-kernel-2.6.32-rh/pve2/config-2.6.32.diff
===================================================================
--- pve-kernel-2.6.32-rh/pve2/config-2.6.32.diff	2011-07-19 08:40:16 UTC (rev 6324)
+++ pve-kernel-2.6.32-rh/pve2/config-2.6.32.diff	2011-07-19 09:53:57 UTC (rev 6325)
@@ -40,20 +40,6 @@
  CONFIG_DM_DEBUG=y
  CONFIG_DM_CRYPT=m
  CONFIG_DM_SNAPSHOT=m
-@@ -2964,11 +2964,11 @@
- # CONFIG_DRM_TDFX is not set
- CONFIG_DRM_R128=m
- CONFIG_DRM_RADEON=m
--CONFIG_DRM_RADEON_KMS=y
-+# CONFIG_DRM_RADEON_KMS is not set
- # CONFIG_DRM_I810 is not set
- # CONFIG_DRM_I830 is not set
- CONFIG_DRM_I915=m
--CONFIG_DRM_I915_KMS=y
-+# CONFIG_DRM_I915_KMS is not set
- CONFIG_DRM_MGA=m
- CONFIG_DRM_SIS=m
- CONFIG_DRM_VIA=m
 @@ -3092,6 +3092,11 @@
  # CONFIG_LOGO_LINUX_MONO is not set
  # CONFIG_LOGO_LINUX_VGA16 is not set