diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-29 12:52:08 -0700 |
|---|---|---|
| committer | Linaro CI <john.rigby@linaro.org> | 2012-02-07 22:49:35 +0000 |
| commit | 8d1acfd12ccdf940f7f6c01a3c6c13aeb14ba4f7 (patch) | |
| tree | b03e2de5bdb73dd00dc17006da58a07a69851436 /debian.master | |
| parent | 41a349eb475514986dcf9fd4260ff6448bf60336 (diff) | |
UBUNTU: [Config] Enable CONFIG_NET_CLS_CGROUP=y on arm
Per the non-modular module review, enable CONFIG_NET_CLS_CGROUP=y on arm
for consistency across all flavors.
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'debian.master')
| -rw-r--r-- | debian.master/config/amd64/config.common.amd64 | 1 | ||||
| -rw-r--r-- | debian.master/config/armel/config.common.armel | 1 | ||||
| -rw-r--r-- | debian.master/config/config.common.ubuntu | 1 | ||||
| -rw-r--r-- | debian.master/config/i386/config.common.i386 | 1 | ||||
| -rw-r--r-- | debian.master/config/powerpc/config.common.powerpc | 1 | ||||
| -rw-r--r-- | debian.master/config/ppc64/config.common.ppc64 | 1 |
6 files changed, 1 insertions, 5 deletions
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index e397638bafa..154a99d2182 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -154,7 +154,6 @@ CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_NATIONAL_PHY=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y -CONFIG_NET_CLS_CGROUP=y CONFIG_NET_CLS_FLOW=m CONFIG_NET_CLS_U32=m CONFIG_NET_DCCPPROBE=m diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index e331dd04436..519041b87ea 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -139,7 +139,6 @@ CONFIG_MTD_NAND_IDS=y # CONFIG_MUTEX_SPIN_ON_OWNER is not set CONFIG_NATIONAL_PHY=y CONFIG_NEED_DMA_MAP_STATE=y -# CONFIG_NET_CLS_CGROUP is not set # CONFIG_NET_CLS_FLOW is not set # CONFIG_NET_CLS_U32 is not set # CONFIG_NET_DCCPPROBE is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index ddd11b3323b..e9c78251fdf 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -3357,6 +3357,7 @@ CONFIG_NET_ACT_SKBEDIT=m CONFIG_NET_CLS=y CONFIG_NET_CLS_ACT=y CONFIG_NET_CLS_BASIC=m +CONFIG_NET_CLS_CGROUP=y CONFIG_NET_CLS_FW=m # CONFIG_NET_CLS_IND is not set CONFIG_NET_CLS_ROUTE4=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index a87fe46914a..5cbac4aedd0 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -152,7 +152,6 @@ CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_NATIONAL_PHY=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y -CONFIG_NET_CLS_CGROUP=y CONFIG_NET_CLS_FLOW=m CONFIG_NET_CLS_U32=m CONFIG_NET_DCCPPROBE=m diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 9620d1a94cd..2dd9dbcbea3 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -135,7 +135,6 @@ CONFIG_MTD_NAND_ECC=m CONFIG_MTD_NAND_IDS=m CONFIG_MTD_SM_COMMON=m CONFIG_NATIONAL_PHY=m -CONFIG_NET_CLS_CGROUP=y CONFIG_NET_CLS_FLOW=m CONFIG_NET_CLS_U32=m CONFIG_NET_DCCPPROBE=m diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index 37e334b4a6e..3eb9223ba28 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -156,7 +156,6 @@ CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_NATIONAL_PHY=m CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y -CONFIG_NET_CLS_CGROUP=y CONFIG_NET_CLS_FLOW=m CONFIG_NET_CLS_U32=m CONFIG_NET_DCCPPROBE=m |