aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Salveti de Araujo <ricardo.salveti@linaro.org>2012-02-20 03:18:48 -0200
committerRicardo Salveti de Araujo <ricardo.salveti@linaro.org>2012-02-20 03:19:37 -0200
commit3f45f309f75b52ff5c0430695ba55b9d0e9efaf6 (patch)
tree8a1feabd7cb30621e65ec7fbd7ee90484f197567
parentde9f8087a1b663eb097c397fc35fc0993476f11e (diff)
downloadlinux-lt-ci-pack-info-3f45f309f75b52ff5c0430695ba55b9d0e9efaf6.tar.gz
LINARO: CONFIG: Extending network support (bridge and vlan)
BugLink: https://bugs.launchpad.net/linaro-ubuntu/+bug/904737 Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>
-rw-r--r--debian.linaro/config/config.common.ubuntu13
1 files changed, 10 insertions, 3 deletions
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu
index 39e665e..5945e27 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -194,7 +194,10 @@ CONFIG_BLOCK=y
CONFIG_BOUNCE=y
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_BRCMUTIL is not set
-# CONFIG_BRIDGE is not set
+CONFIG_BRIDGE=y
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+CONFIG_BRIDGE_NETFILTER=y
+# CONFIG_BRIDGE_NF_EBTABLES is not set
# CONFIG_BROADCOM_PHY is not set
# CONFIG_BSD_DISKLABEL is not set
CONFIG_BSD_PROCESS_ACCT=y
@@ -1166,6 +1169,7 @@ CONFIG_LIRC_STAGING=y
CONFIG_LIRC_TTUSBIR=m
CONFIG_LIRC_ZILOG=m
# CONFIG_LKDTM is not set
+CONFIG_LLC=y
# CONFIG_LLC2 is not set
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
@@ -1486,6 +1490,7 @@ CONFIG_NETFILTER_XT_MATCH_MARK=m
CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
CONFIG_NETFILTER_XT_MATCH_OSF=m
CONFIG_NETFILTER_XT_MATCH_OWNER=m
+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
CONFIG_NETFILTER_XT_MATCH_POLICY=m
CONFIG_NETFILTER_XT_MATCH_QUOTA=m
@@ -2236,6 +2241,7 @@ CONFIG_STANDALONE=y
# CONFIG_STE10XP is not set
# CONFIG_STMMAC_ETH is not set
CONFIG_STOP_MACHINE=y
+CONFIG_STP=y
CONFIG_STRICT_DEVMEM=y
# CONFIG_STRIP_ASM_SYMS is not set
CONFIG_SUNRPC=y
@@ -2537,7 +2543,7 @@ CONFIG_USB_NET_NET1080=y
# CONFIG_USB_NET_RNDIS_WLAN is not set
# CONFIG_USB_NET_SMSC75XX is not set
CONFIG_USB_NET_SMSC95XX=y
-CONFIG_USB_NET_ZAURUS=y
+CONFIG_USB_NET_ZAURUS=m
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
CONFIG_USB_OHCI_HCD=y
@@ -2751,7 +2757,8 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y
# CONFIG_VIRT_DRIVERS is not set
CONFIG_VIRT_TO_BUS=y
# CONFIG_VITESSE_PHY is not set
-# CONFIG_VLAN_8021Q is not set
+CONFIG_VLAN_8021Q=y
+# CONFIG_VLAN_8021Q_GVRP is not set
# CONFIG_VMSPLIT_1G is not set
# CONFIG_VMSPLIT_2G is not set
CONFIG_VMSPLIT_3G=y