diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-29 13:16:37 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-09-23 08:59:04 -0600 |
| commit | 8808738416b823f72ef25a7bf0b890a629be82aa (patch) | |
| tree | c9b02ee29db2a1cf0e07fd0ebc7bb99572d1c78f | |
| parent | 3fed14a4b198d123b6d7f00ec6a3f8bd70ebfe48 (diff) | |
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>
| -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 5422714a43f..4069a6acece 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_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 53f016db2a7..09aa5e7466a 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_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 df2310d92d0..645caf98226 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -3363,6 +3363,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 2f7f5b1b590..08254d5d7ad 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_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 3079947b6ed..a08372c4ced 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_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 7452a7f68a0..2a01f841c8f 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_SCH_INGRESS=m CONFIG_NET_TCPPROBE=m CONFIG_NL80211_TESTMODE=y CONFIG_NODES_SHIFT=8 |