diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-29 13:05:12 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-11-16 14:41:10 -0700 |
| commit | 7df4630641d2cc6754d56ca420df9540a8ca3a28 (patch) | |
| tree | ab1c9315fd7feff38040f2b7b2bac0a862921109 /debian.master | |
| parent | 104ef45dd041e4a28d220650173e38f06d58385d (diff) | |
UBUNTU: [Config] Enable CONFIG_NET_CLS_U32=m on arm
Per the non-modular module review, enable CONFIG_NET_CLS_U32=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 b727e645891..6918124cdc1 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_U32=m CONFIG_NET_DCCPPROBE=m CONFIG_NET_POCKET=y CONFIG_NET_SCH_INGRESS=m diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 8f1ef1983cb..7b4260d7d41 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_U32 is not set # CONFIG_NET_DCCPPROBE is not set # CONFIG_NET_POCKET is not set # CONFIG_NET_SCH_INGRESS is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 956f60be7b1..c5bf46c100a 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -3365,6 +3365,7 @@ CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_RSVP=m CONFIG_NET_CLS_RSVP6=m CONFIG_NET_CLS_TCINDEX=m +CONFIG_NET_CLS_U32=m CONFIG_NET_DMA=y # CONFIG_NET_DROP_MONITOR is not set CONFIG_NET_DSA=y diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 8fea6ab1a62..a9770564bf6 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_U32=m CONFIG_NET_DCCPPROBE=m CONFIG_NET_POCKET=y CONFIG_NET_SCH_INGRESS=m diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index fb8ad12986e..47f82b07acb 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_U32=m CONFIG_NET_DCCPPROBE=m CONFIG_NET_POCKET=y CONFIG_NET_SCH_INGRESS=m diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index 160e727c0e3..61fcd28692b 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_U32=m CONFIG_NET_DCCPPROBE=m CONFIG_NET_POCKET=y CONFIG_NET_SCH_INGRESS=m |