diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-29 13:05:12 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-09-23 08:59:01 -0600 |
| commit | e6f3f2aab6a3f35bb22ac585159af330e0a632fb (patch) | |
| tree | 3c3eb7f9805f5d5c71f520e2a744183799e8148a | |
| parent | 6f8b49f5641ad7b3de8bb75435512c36a0d81910 (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>
| -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 ab30dc3808a..dba439b7922 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_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 31ed845cfc3..dd6f0e4e8fa 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_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 81c4e815ef0..8c32fb4ae91 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -3318,6 +3318,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 919b0e21e6d..f1df18f73e5 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_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 d38d7a11516..43c442a29ef 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_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 05b8465f9af..4ae5ffa3584 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_U32=m CONFIG_NET_DCCPPROBE=m CONFIG_NET_POCKET=y CONFIG_NET_SCH_INGRESS=m |