diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-29 13:09:39 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-09-23 08:59:03 -0600 |
| commit | 3fed14a4b198d123b6d7f00ec6a3f8bd70ebfe48 (patch) | |
| tree | 5e876058f6ed00a4fc890328c29ec6987c600d62 /debian.master | |
| parent | e6f3f2aab6a3f35bb22ac585159af330e0a632fb (diff) | |
UBUNTU: [Config] Enable CONFIG_NET_DCCPPROBE=m on arm
Per the non-modular module review, enable CONFIG_NET_DCCPPROBE=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 dba439b7922..5422714a43f 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_DCCPPROBE=m CONFIG_NET_POCKET=y CONFIG_NET_SCH_INGRESS=m CONFIG_NET_TCPPROBE=m diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index dd6f0e4e8fa..53f016db2a7 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_DCCPPROBE is not set # CONFIG_NET_POCKET is not set # CONFIG_NET_SCH_INGRESS is not set # CONFIG_NET_TCPPROBE is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 8c32fb4ae91..df2310d92d0 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -3319,6 +3319,7 @@ CONFIG_NET_CLS_RSVP=m CONFIG_NET_CLS_RSVP6=m CONFIG_NET_CLS_TCINDEX=m CONFIG_NET_CLS_U32=m +CONFIG_NET_DCCPPROBE=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 f1df18f73e5..2f7f5b1b590 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_DCCPPROBE=m CONFIG_NET_POCKET=y CONFIG_NET_SCH_INGRESS=m CONFIG_NET_TCPPROBE=m diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 43c442a29ef..3079947b6ed 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_DCCPPROBE=m CONFIG_NET_POCKET=y CONFIG_NET_SCH_INGRESS=m CONFIG_NET_TCPPROBE=m diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index 4ae5ffa3584..7452a7f68a0 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_DCCPPROBE=m CONFIG_NET_POCKET=y CONFIG_NET_SCH_INGRESS=m CONFIG_NET_TCPPROBE=m |