[kernel] r16038 - in dists/trunk/linux-2.6/debian: . config

[Maximilian Attems]

Author: maks
Date: Mon Aug  2 07:17:54 2010
New Revision: 16038

Log:
topconfig enable modular VMWARE_BALLOON

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

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Mon Aug  2 07:17:40 2010	(r16037)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Aug  2 07:17:54 2010	(r16038)
@@ -4,7 +4,7 @@
     - [ia64] Fix crash when gcore reads gate area (Closes: #588574)
     - tpm_tis: fix subsequent suspend failures (Closes: #591031)
 
-  * topconfig enable BLK_CGROUP, NETFILTER_XT_TARGET_TEE.
+  * topconfig enable BLK_CGROUP, NETFILTER_XT_TARGET_TEE, VMWARE_BALLOON.
   * x86 enable INTEL_IDLE.
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 02 Aug 2010 02:21:32 +0100

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Mon Aug  2 07:17:40 2010	(r16037)
+++ dists/trunk/linux-2.6/debian/config/config	Mon Aug  2 07:17:54 2010	(r16038)
@@ -1328,6 +1328,7 @@
 # CONFIG_SGI_GRU_DEBUG is not set
 CONFIG_ISL29003=m
 CONFIG_TI_DAC7512=m
+CONFIG_VMWARE_BALLOON=m
 
 ##
 ## file: drivers/misc/c2port/Kconfig