diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-29 13:00:39 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-09-23 08:58:59 -0600 |
| commit | 6f8b49f5641ad7b3de8bb75435512c36a0d81910 (patch) | |
| tree | b7e19d47f71e345073aa66ed71c80abf0ed1f1de /debian.master | |
| parent | 72638772f50797d75c761e01ce06b33f5b295233 (diff) | |
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.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 f663aca40ae..ab30dc3808a 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -151,7 +151,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 961ef082002..31ed845cfc3 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -137,7 +137,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 79822ff353a..81c4e815ef0 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -3311,6 +3311,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 5a3214d3b7f..919b0e21e6d 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -150,7 +150,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 f2a04b8c8c1..d38d7a11516 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -133,7 +133,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 ea8826e44a6..05b8465f9af 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -154,7 +154,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 |