Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0fd6c30 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: fsm9900: Add SCTP support"

parents 03a02169 2556b7ca

arch/arm/configs/fsm9900-perf_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ CONFIG_INET6_IPCOMP=y 
# CONFIG_NET_ACTIVITY_STATS is not set

CONFIG_NETFILTER=y

CONFIG_NF_CONNTRACK=m

# CONFIG_NF_CT_PROTO_SCTP is not set

CONFIG_NETFILTER_XTABLES=y

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m

CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
@@ -135,6 +136,7 @@ CONFIG_BRIDGE_EBT_IP6=m 
CONFIG_BRIDGE_EBT_LIMIT=m

CONFIG_BRIDGE_EBT_PKTTYPE=m

CONFIG_BRIDGE_EBT_VLAN=m

CONFIG_IP_SCTP=y

CONFIG_BRIDGE=y

CONFIG_VLAN_8021Q=y

CONFIG_NET_SCHED=y
@@ -320,4 +322,3 @@ CONFIG_CRYPTO_TWOFISH=y 
CONFIG_CRYPTO_DEV_QCRYPTO=y

CONFIG_CRYPTO_DEV_QCE=y

CONFIG_CRYPTO_DEV_OTA_CRYPTO=m
 
CONFIG_LIBCRC32C=y

arch/arm/configs/fsm9900_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ CONFIG_INET6_IPCOMP=y 
# CONFIG_NET_ACTIVITY_STATS is not set

CONFIG_NETFILTER=y

CONFIG_NF_CONNTRACK=m

# CONFIG_NF_CT_PROTO_SCTP is not set

CONFIG_NETFILTER_XTABLES=y

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m

CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
@@ -136,6 +137,7 @@ CONFIG_BRIDGE_EBT_IP6=m 
CONFIG_BRIDGE_EBT_LIMIT=m

CONFIG_BRIDGE_EBT_PKTTYPE=m

CONFIG_BRIDGE_EBT_VLAN=m

CONFIG_IP_SCTP=y

CONFIG_BRIDGE=y

CONFIG_VLAN_8021Q=y

CONFIG_NET_SCHED=y
@@ -335,4 +337,3 @@ CONFIG_CRYPTO_TWOFISH=y 
CONFIG_CRYPTO_DEV_QCRYPTO=y

CONFIG_CRYPTO_DEV_QCE=y

CONFIG_CRYPTO_DEV_OTA_CRYPTO=m
 
CONFIG_LIBCRC32C=y