diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-29 13:21:53 -0700 |
|---|---|---|
| committer | Linaro CI <john.rigby@linaro.org> | 2012-02-07 22:49:42 +0000 |
| commit | e545253b66f01148d0bc4ae5a5178a9a2c3b3e7a (patch) | |
| tree | d95a258ccc02f93a1d1c4960aa2d4c88bc808455 /debian.master | |
| parent | e54e03f693fb4a0002d66a034f0ebc26f05d96bc (diff) | |
UBUNTU: [Config] Enable CONFIG_NET_TCPPROBE=m on arm
Per the non-modular module review, enable CONFIG_NET_TCPPROBE=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 946737e2e16..9fc30d9845b 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -155,7 +155,6 @@ CONFIG_NATIONAL_PHY=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y CONFIG_NET_POCKET=y -CONFIG_NET_TCPPROBE=m CONFIG_NL80211_TESTMODE=y CONFIG_NODES_SHIFT=6 CONFIG_NOP_USB_XCEIV=m diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 1984c1b65c3..4ea2594ec65 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -140,7 +140,6 @@ CONFIG_MTD_NAND_IDS=y CONFIG_NATIONAL_PHY=y CONFIG_NEED_DMA_MAP_STATE=y # CONFIG_NET_POCKET is not set -# CONFIG_NET_TCPPROBE is not set # CONFIG_NL80211_TESTMODE is not set CONFIG_NOP_USB_XCEIV=y CONFIG_NVRAM=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 6ce1919c898..6be99271f18 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -3422,6 +3422,7 @@ CONFIG_NET_SCH_SFQ=m CONFIG_NET_SCH_TBF=m CONFIG_NET_SCH_TEQL=m CONFIG_NET_SCTPPROBE=m +CONFIG_NET_TCPPROBE=m CONFIG_NET_TULIP=y CONFIG_NET_VENDOR_3COM=y CONFIG_NET_VENDOR_RACAL=y diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index c3d5a0ccead..38fe1b8bdad 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -153,7 +153,6 @@ CONFIG_NATIONAL_PHY=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y CONFIG_NET_POCKET=y -CONFIG_NET_TCPPROBE=m CONFIG_NL80211_TESTMODE=y CONFIG_NOP_USB_XCEIV=m CONFIG_NR_CPUS=8 diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 87c8dd7578e..d13df623abe 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -136,7 +136,6 @@ CONFIG_MTD_NAND_IDS=m CONFIG_MTD_SM_COMMON=m CONFIG_NATIONAL_PHY=m CONFIG_NET_POCKET=y -CONFIG_NET_TCPPROBE=m CONFIG_NL80211_TESTMODE=y CONFIG_NODES_SHIFT=8 CONFIG_NOP_USB_XCEIV=m diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index 8cb84343ce4..146db2acbcd 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -157,7 +157,6 @@ CONFIG_NATIONAL_PHY=m CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y CONFIG_NET_POCKET=y -CONFIG_NET_TCPPROBE=m CONFIG_NL80211_TESTMODE=y CONFIG_NODES_SHIFT=8 CONFIG_NOP_USB_XCEIV=m |