From ab30e6532144a4ece3f5f7b2424e08cf6246733f Mon Sep 17 00:00:00 2001
From: Leann Ogasawara <leann.ogasawara@canonical.com>
Date: Mon, 29 Aug 2011 13:21:53 -0700
Subject: 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>
---
 debian.master/config/amd64/config.common.amd64     | 1 -
 debian.master/config/armel/config.common.armel     | 1 -
 debian.master/config/config.common.ubuntu          | 1 +
 debian.master/config/i386/config.common.i386       | 1 -
 debian.master/config/powerpc/config.common.powerpc | 1 -
 debian.master/config/ppc64/config.common.ppc64     | 1 -
 6 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 4069a6acece..eafabfce7d2 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -152,7 +152,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 09aa5e7466a..001e7320989 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -138,7 +138,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 645caf98226..b95f40d67a5 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3375,6 +3375,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 08254d5d7ad..5106e45ea8e 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -151,7 +151,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 a08372c4ced..c59a35f8fe1 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -134,7 +134,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 2a01f841c8f..4f70aad5215 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -155,7 +155,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
-- 
cgit v1.2.3