aboutsummaryrefslogtreecommitdiff
path: root/debian.master
diff options
context:
space:
mode:
authorLeann Ogasawara <leann.ogasawara@canonical.com>2011-08-29 13:00:39 -0700
committerJohn Rigby <john.rigby@linaro.org>2011-11-16 14:41:09 -0700
commit104ef45dd041e4a28d220650173e38f06d58385d (patch)
treebcbe6143fc9e9224b978a995907711000f762d51 /debian.master
parenta51b3820e46761eb9cc4ba187618d76114baabfb (diff)
downloadlinux-linaro-precise-104ef45dd041e4a28d220650173e38f06d58385d.tar.gz
UBUNTU: [Config] Enable CONFIG_NET_CLS_FLOW=m on arm
Per the non-modular module review, enable CONFIG_NET_CLS_FLOW=m 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.amd641
-rw-r--r--debian.master/config/armel/config.common.armel1
-rw-r--r--debian.master/config/config.common.ubuntu1
-rw-r--r--debian.master/config/i386/config.common.i3861
-rw-r--r--debian.master/config/powerpc/config.common.powerpc1
-rw-r--r--debian.master/config/ppc64/config.common.ppc641
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 154a99d2182..b727e645891 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_FLOW=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_DCCPPROBE=m
CONFIG_NET_POCKET=y
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 519041b87ea..8f1ef1983cb 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_FLOW is not set
# CONFIG_NET_CLS_U32 is not set
# CONFIG_NET_DCCPPROBE is not set
# CONFIG_NET_POCKET is not set
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index e9c78251fdf..956f60be7b1 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3358,6 +3358,7 @@ CONFIG_NET_CLS=y
CONFIG_NET_CLS_ACT=y
CONFIG_NET_CLS_BASIC=m
CONFIG_NET_CLS_CGROUP=y
+CONFIG_NET_CLS_FLOW=m
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 5cbac4aedd0..8fea6ab1a62 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_FLOW=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_DCCPPROBE=m
CONFIG_NET_POCKET=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 2dd9dbcbea3..fb8ad12986e 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_FLOW=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_DCCPPROBE=m
CONFIG_NET_POCKET=y
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 3eb9223ba28..160e727c0e3 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_FLOW=m
CONFIG_NET_CLS_U32=m
CONFIG_NET_DCCPPROBE=m
CONFIG_NET_POCKET=y