aboutsummaryrefslogtreecommitdiff
path: root/debian.master
diff options
context:
space:
mode:
authorLeann Ogasawara <leann.ogasawara@canonical.com>2011-08-29 13:16:37 -0700
committerJohn Rigby <john.rigby@linaro.org>2011-11-16 14:41:12 -0700
commit793963c916f0f3441d31b89d55591e9d14e1a0aa (patch)
treebc65a7959d72027b5f4f3b9a1f4b38f5370c14e6 /debian.master
parentbcb435d6ceb8d2371651a7b81b13fbc7e515c112 (diff)
downloadlinux-linaro-precise-793963c916f0f3441d31b89d55591e9d14e1a0aa.tar.gz
UBUNTU: [Config] Enable CONFIG_NET_SCH_INGRESS=m on arm
Per the non-modular module review, enable CONFIG_NET_SCH_INGRESS=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 b66eed6b380..946737e2e16 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_SCH_INGRESS=m
CONFIG_NET_TCPPROBE=m
CONFIG_NL80211_TESTMODE=y
CONFIG_NODES_SHIFT=6
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 0d15bae38ab..1984c1b65c3 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_SCH_INGRESS is not set
# CONFIG_NET_TCPPROBE is not set
# CONFIG_NL80211_TESTMODE is not set
CONFIG_NOP_USB_XCEIV=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 69f50422732..6ce1919c898 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3410,6 +3410,7 @@ CONFIG_NET_SCH_FIFO=y
CONFIG_NET_SCH_GRED=m
CONFIG_NET_SCH_HFSC=m
CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_SCH_MQPRIO=m
CONFIG_NET_SCH_MULTIQ=m
CONFIG_NET_SCH_NETEM=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index a53aa5d8b80..c3d5a0ccead 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_SCH_INGRESS=m
CONFIG_NET_TCPPROBE=m
CONFIG_NL80211_TESTMODE=y
CONFIG_NOP_USB_XCEIV=m
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 26450780011..87c8dd7578e 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_SCH_INGRESS=m
CONFIG_NET_TCPPROBE=m
CONFIG_NL80211_TESTMODE=y
CONFIG_NODES_SHIFT=8
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 68d1492f995..8cb84343ce4 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_SCH_INGRESS=m
CONFIG_NET_TCPPROBE=m
CONFIG_NL80211_TESTMODE=y
CONFIG_NODES_SHIFT=8