[kernel] r16318 - dists/trunk/linux-2.6/debian/config

[Ben Hutchings]

Author: benh
Date: Sun Sep 19 00:55:19 2010
New Revision: 16318

Log:
Remove obsolete GROUP_SCHED and USER_SCHED config options

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

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Sun Sep 19 00:49:58 2010	(r16317)
+++ dists/trunk/linux-2.6/debian/config/config	Sun Sep 19 00:55:19 2010	(r16318)
@@ -3345,13 +3345,6 @@
 CONFIG_RCU_FAST_NO_HZ=y
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=17
-CONFIG_GROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-# CONFIG_RT_GROUP_SCHED is not set
-## choice: Basis for grouping tasks
-# CONFIG_USER_SCHED is not set
-CONFIG_CGROUP_SCHED=y
-## end choice
 CONFIG_CGROUPS=y
 # CONFIG_CGROUP_DEBUG is not set
 CONFIG_CGROUP_NS=y
@@ -3361,6 +3354,9 @@
 CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_CPUACCT=y
 # CONFIG_RESOURCE_COUNTERS is not set
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
 CONFIG_BLK_CGROUP=y
 # CONFIG_DEBUG_BLK_CGROUP is not set
 # CONFIG_SYSFS_DEPRECATED_V2 is not set