[PATCH] UBUNTU: [Config] Enable CONFIG_CGROUPS for highbank

[Ike Panhc]

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

Signed-off-by: Ike Panhc <ike.pan at canonical.com>
---
 debian.master/config/amd64/config.common.amd64     |    1 -
 debian.master/config/armel/config.common.armel     |    1 -
 debian.master/config/armhf/config.flavour.highbank |    1 -
 debian.master/config/armhf/config.flavour.omap     |    1 -
 debian.master/config/config.common.ubuntu          |    1 +
 debian.master/config/i386/config.common.i386       |    1 -
 debian.master/config/powerpc/config.common.powerpc |    1 -
 debian.master/config/ppc64/config.common.ppc64     |    1 -
 8 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 9c81f3b..3b19cba 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -31,7 +31,6 @@ CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BTRFS_FS_POSIX_ACL=y
 CONFIG_CAN_C_CAN_PLATFORM=m
 CONFIG_CFG80211_REG_DEBUG=y
-CONFIG_CGROUPS=y
 CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_CLEANCACHE=y
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 1248e50..73f72d1 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -30,7 +30,6 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_CACHE_L2X0 is not set
 CONFIG_CAN_C_CAN_PLATFORM=m
 CONFIG_CFG80211_REG_DEBUG=y
-CONFIG_CGROUPS=y
 # CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_CLEANCACHE=y
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index 1fe77a1..bea4071 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -21,7 +21,6 @@ CONFIG_BCH=m
 CONFIG_CACHE_L2X0=y
 # CONFIG_CAN_C_CAN_PLATFORM is not set
 # CONFIG_CFG80211_REG_DEBUG is not set
-# CONFIG_CGROUPS is not set
 # CONFIG_CHECKPOINT_RESTORE is not set
 # CONFIG_CLEANCACHE is not set
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index 1cf7756..8a8e75f 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -21,7 +21,6 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_CACHE_L2X0 is not set
 CONFIG_CAN_C_CAN_PLATFORM=m
 CONFIG_CFG80211_REG_DEBUG=y
-CONFIG_CGROUPS=y
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_CLEANCACHE=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index af97bcc..1b7941b 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -829,6 +829,7 @@ CONFIG_CFG80211_DEFAULT_PS=y
 CONFIG_CFG80211_WEXT=y
 CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_CFS_BANDWIDTH=y
+CONFIG_CGROUPS=y
 CONFIG_CGROUP_CPUACCT=y
 # CONFIG_CGROUP_DEBUG is not set
 CONFIG_CGROUP_DEVICE=y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index ad9f741..4f6266f 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -30,7 +30,6 @@ CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BTRFS_FS_POSIX_ACL=y
 CONFIG_CAN_C_CAN_PLATFORM=m
 CONFIG_CFG80211_REG_DEBUG=y
-CONFIG_CGROUPS=y
 CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_CLEANCACHE=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 5047cf7..acca5e2 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -25,7 +25,6 @@ CONFIG_BSD_DISKLABEL=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BTRFS_FS_POSIX_ACL=y
 CONFIG_CAN_C_CAN_PLATFORM=m
-CONFIG_CGROUPS=y
 CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_CLEANCACHE=y
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 949a4b8..a36e97d 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -29,7 +29,6 @@ CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BTRFS_FS_POSIX_ACL=y
 CONFIG_CAN_C_CAN_PLATFORM=m
 # CONFIG_CFG80211_REG_DEBUG is not set
-CONFIG_CGROUPS=y
 CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_CLEANCACHE=y
-- 
1.7.9.5