aboutsummaryrefslogtreecommitdiff
path: root/debian.master
diff options
context:
space:
mode:
authorLeann Ogasawara <leann.ogasawara@canonical.com>2011-08-29 13:09:39 -0700
committerJohn Rigby <john.rigby@linaro.org>2011-11-16 14:41:11 -0700
commitbcb435d6ceb8d2371651a7b81b13fbc7e515c112 (patch)
treeb6daf1b0c2ad4eaf131f157d3fcd99de96545f96 /debian.master
parent7df4630641d2cc6754d56ca420df9540a8ca3a28 (diff)
downloadlinux-linaro-precise-bcb435d6ceb8d2371651a7b81b13fbc7e515c112.tar.gz
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.amd641
-rw-r--r--debian.master/config/armel/config.common.armel1
-rw-r--r--debian.master/config/config.common.ubuntu1
-rw-r--r--debian.master/config/i386/config.common.i3861
-rw-r--r--debian.master/config/powerpc/config.common.powerpc1
-rw-r--r--debian.master/config/ppc64/config.common.ppc641
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 6918124cdc1..b66eed6b380 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_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 7b4260d7d41..0d15bae38ab 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_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 c5bf46c100a..69f50422732 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3366,6 +3366,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 a9770564bf6..a53aa5d8b80 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_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 47f82b07acb..26450780011 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_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 61fcd28692b..68d1492f995 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_DCCPPROBE=m
CONFIG_NET_POCKET=y
CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_TCPPROBE=m