topconfig enable modular BLK_CGROUP

svn path=/dists/trunk/linux-2.6/; revision=16035
This commit is contained in:
Maximilian Attems 2010-08-02 07:16:07 +00:00
parent 0221b2bbc2
commit 9795ff510e
2 changed files with 4 additions and 0 deletions

2
debian/changelog vendored
View File

@ -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

View File

@ -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