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

[Ben Hutchings]

Author: benh
Date: Sun Dec 23 23:21:27 2012
New Revision: 19642

Log:
[!x86] drm: Disable DRM_VMWGFX

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

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Sun Dec 23 23:06:58 2012	(r19641)
+++ dists/trunk/linux/debian/changelog	Sun Dec 23 23:21:27 2012	(r19642)
@@ -44,6 +44,7 @@
   * rt2800pci: Enable RT2800PCI_RT3290
   * wireless/ti: Enable WL18XX as module
   * ptp: Enable clock drivers along with associated net/PHY drivers
+  * [!x86] drm: Disable DRM_VMWGFX
 
  -- maximilian attems <maks at debian.org>  Thu, 06 Dec 2012 18:14:33 +0100
 

Modified: dists/trunk/linux/debian/config/config
==============================================================================
--- dists/trunk/linux/debian/config/config	Sun Dec 23 23:06:58 2012	(r19641)
+++ dists/trunk/linux/debian/config/config	Sun Dec 23 23:21:27 2012	(r19642)
@@ -413,7 +413,7 @@
 ##
 ## file: drivers/gpu/drm/vmwgfx/Kconfig
 ##
-CONFIG_DRM_VMWGFX=m
+# CONFIG_DRM_VMWGFX is not set
 
 ##
 ## file: drivers/hid/Kconfig

Modified: dists/trunk/linux/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config	Sun Dec 23 23:06:58 2012	(r19641)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config	Sun Dec 23 23:21:27 2012	(r19642)
@@ -458,6 +458,11 @@
 CONFIG_DRM_RADEON_KMS=y
 
 ##
+## file: drivers/gpu/drm/vmwgfx/Kconfig
+##
+CONFIG_DRM_VMWGFX=m
+
+##
 ## file: drivers/gpu/stub/Kconfig
 ##
 # CONFIG_STUB_POULSBO is not set