Change BLK_CGROUP from module to built-in

so that cfq can be the default I/O scheduler again (Closes: #593720)

svn path=/dists/trunk/linux-2.6/; revision=16187
This commit is contained in:
Ben Hutchings 2010-08-27 04:24:38 +00:00
parent 979949830e
commit baf49ce6f5
2 changed files with 3 additions and 1 deletions

2
debian/changelog vendored
View File

@ -14,6 +14,8 @@ linux-2.6 (2.6.35-1~experimental.3) UNRELEASED; urgency=low
- German (Holger Wansing) (Closes: #592226)
* [x86] Enable samsung-laptop driver
* [sparc] Enable XVR1000 driver (Closes: #574243)
* Change BLK_CGROUP from module to built-in so that cfq can be the
default I/O scheduler again (Closes: #593720)
[ Ian Campbell ]
* Fixes/overrides for Linitan warnings:

View File

@ -3361,7 +3361,7 @@ CONFIG_CPUSETS=y
CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
# CONFIG_RESOURCE_COUNTERS is not set
CONFIG_BLK_CGROUP=m
CONFIG_BLK_CGROUP=y
# CONFIG_DEBUG_BLK_CGROUP is not set
# CONFIG_SYSFS_DEPRECATED_V2 is not set
CONFIG_RELAY=y