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

[Maximilian Attems]

Author: maks
Date: Mon Aug  2 07:16:07 2010
New Revision: 16035

Log:
topconfig enable modular BLK_CGROUP

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 01:30:37 2010	(r16034)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Aug  2 07:16:07 2010	(r16035)
@@ -4,6 +4,8 @@
     - [ia64] Fix crash when gcore reads gate area (Closes: #588574)
     - tpm_tis: fix subsequent suspend failures (Closes: #591031)
 
+  * topconfig enable BLK_CGROUP.
+
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 02 Aug 2010 02:21:32 +0100
 
 linux-2.6 (2.6.35~rc6-1~experimental.1) experimental; urgency=low

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Mon Aug  2 01:30:37 2010	(r16034)
+++ dists/trunk/linux-2.6/debian/config/config	Mon Aug  2 07:16:07 2010	(r16035)
@@ -3320,6 +3320,8 @@
 CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_CPUACCT=y
 # CONFIG_RESOURCE_COUNTERS is not set
+CONFIG_BLK_CGROUP=m
+# CONFIG_DEBUG_BLK_CGROUP is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
 CONFIG_RELAY=y
 CONFIG_UTS_NS=y