UBUNTU: [Config] Normalize CGROUP config settings

CGROUP settings are arch independent and should be the same as
the master branch.

BugLink: http://bugs.launchpad.net/bugs/831954

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

1 files changed, 5 insertions, 6 deletions

diff --git a/debian.ti-omap4/config/config.common.ubuntu b/debian.ti-omap4/config/config.common.ubuntu
index 03bf7bfffa4..b57afb2931c 100644
--- a/debian.ti-omap4/config/config.common.ubuntu
+++ b/debian.ti-omap4/config/config.common.ubuntu
@@ -290,7 +290,7 @@ CONFIG_BINFMT_AOUT=m
 CONFIG_BINFMT_ELF=y
 CONFIG_BINFMT_MISC=y
 CONFIG_BITREVERSE=y
-# CONFIG_BLK_CGROUP is not set
+CONFIG_BLK_CGROUP=y
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_BSG is not set
 CONFIG_BLK_DEV_COMPCACHE=m
@@ -313,6 +313,7 @@ CONFIG_BLK_DEV_RAM_SIZE=65536
 CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_DEV_SR=m
 # CONFIG_BLK_DEV_SR_VENDOR is not set
+# CONFIG_BLK_DEV_THROTTLING is not set
 # CONFIG_BLK_DEV_UB is not set
 # CONFIG_BLK_DEV_XIP is not set
 CONFIG_BLOCK=y
@@ -418,6 +419,7 @@ CONFIG_CFG80211_DEFAULT_PS=y
 # CONFIG_CFG80211_INTERNAL_REGDB is not set
 CONFIG_CFG80211_REG_DEBUG=y
 CONFIG_CFG80211_WEXT=y
+CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_CGROUPS=y
 CONFIG_CGROUP_CPUACCT=y
 # CONFIG_CGROUP_DEBUG is not set
@@ -425,7 +427,7 @@ CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_MEM_RES_CTLR=y
 # CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
-# CONFIG_CGROUP_PERF is not set
+CONFIG_CGROUP_PERF=y
 CONFIG_CGROUP_SCHED=y
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_ISP1704 is not set
@@ -571,6 +573,7 @@ CONFIG_CRYPTO_ZLIB=m
 CONFIG_CUSE=m
 CONFIG_DAVICOM_PHY=m
 CONFIG_DCB=y
+# CONFIG_DEBUG_BLK_CGROUP is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_CREDENTIALS is not set
@@ -2595,10 +2598,6 @@ CONFIG_SERIO_SERPORT=y
 CONFIG_SGI_PARTITION=y
 # CONFIG_SGX530 is not set
 # CONFIG_SGX540 is not set
-# CONFIG_SGX_540_BUILD_DEBUG is not set
-# CONFIG_SGX_540_BUILD_RELEASE is not set
-# CONFIG_SGX_REV110 is not set
-# CONFIG_SGX_REV120 is not set
 CONFIG_SHMEM=y
 CONFIG_SIGMATEL_FIR=m
 CONFIG_SIGNALFD=y