Disable CONFIG_SYSFS_DEPRECATED, enable CGROUP and scheduling support

(cherry picked from commit b42c0a36c7480ee7fb1e3643edda802ddbac59e9)

Conflicts:

	.config

diff --git a/.config b/.config
index 3a143b720e09f3baad8df0b1556b0675fc06ca44..c1c05caa5ac3fbd4cbf33c9a136a482523d6ee53 100644 (file)
--- a/.config
+++ b/.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.30.4-zb5s
+# Linux kernel version: 2.6.30.7-zb5s
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -109,10 +109,9 @@ CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
 CONFIG_CGROUP_MEM_RES_CTLR=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 CONFIG_MM_OWNER=y
-CONFIG_SYSFS_DEPRECATED=y
-CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_SYSFS_DEPRECATED_V2 is not set
 CONFIG_RELAY=y
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
@@ -4207,7 +4206,6 @@ CONFIG_THINKPAD_ACPI=m
 CONFIG_THINKPAD_ACPI_DEBUGFACILITIES=y
 CONFIG_THINKPAD_ACPI_DEBUG=y
 CONFIG_THINKPAD_ACPI_UNSAFE_LEDS=y
-CONFIG_THINKPAD_ACPI_BAY=y
 CONFIG_THINKPAD_ACPI_VIDEO=y
 CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
 CONFIG_INTEL_MENLOW=m