From 9795ff510e716c47f2a1419d95efaf1388005d10 Mon Sep 17 00:00:00 2001
From: Maximilian Attems <maks@debian.org>
Date: Mon, 2 Aug 2010 07:16:07 +0000
Subject: [PATCH] topconfig enable modular BLK_CGROUP

svn path=/dists/trunk/linux-2.6/; revision=16035
---
 debian/changelog     | 2 ++
 debian/config/config | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0a7328f1c..d1d9d216f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ linux-2.6 (2.6.35-1~experimental.1) UNRELEASED; urgency=low
     - [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@decadent.org.uk>  Mon, 02 Aug 2010 02:21:32 +0100
 
 linux-2.6 (2.6.35~rc6-1~experimental.1) experimental; urgency=low
diff --git a/debian/config/config b/debian/config/config
index d9363ec3e..ab2eeeef6 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -3320,6 +3320,8 @@ CONFIG_CPUSETS=y
 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