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

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

Merge "defconfig: arm: msm8909: Enable data features"

parents 0e3a9806 4b78415f

arch/arm/configs/msm8909-1gb_defconfig

+10 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ CONFIG_NET=y 
CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_XFRM_USER=y

CONFIG_NET_KEY=y

CONFIG_INET=y

CONFIG_INET_AH=y

CONFIG_INET_ESP=y
@@ -86,6 +87,7 @@ CONFIG_IP_PNP=y 
CONFIG_IP_PNP_DHCP=y

CONFIG_INET_XFRM_MODE_TRANSPORT=y

CONFIG_INET_XFRM_MODE_TUNNEL=y

CONFIG_INET_IPCOMP=y

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

CONFIG_IPV6=y
@@ -100,6 +102,7 @@ CONFIG_IPV6_MIP6=y 
CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_IPV6_SUBTREES=y

CONFIG_NETFILTER=y

CONFIG_NETFILTER_XTABLES=y

CONFIG_NETFILTER_NETLINK_LOG=y

CONFIG_NF_CONNTRACK=y

CONFIG_NF_CONNTRACK_SECMARK=y
@@ -155,6 +158,7 @@ CONFIG_NETFILTER_XT_MATCH_STATISTIC=y 
CONFIG_NETFILTER_XT_MATCH_STRING=y

CONFIG_NETFILTER_XT_MATCH_TIME=y

CONFIG_NETFILTER_XT_MATCH_U32=y

CONFIG_NETFILTER_XT_MATCH_ESP=y

CONFIG_NF_CONNTRACK_IPV4=y

CONFIG_IP_NF_IPTABLES=y

CONFIG_IP_NF_MATCH_AH=y
@@ -162,6 +166,7 @@ CONFIG_IP_NF_MATCH_ECN=y 
CONFIG_IP_NF_MATCH_TTL=y

CONFIG_IP_NF_FILTER=y

CONFIG_IP_NF_TARGET_REJECT=y

CONFIG_IP_NF_TARGET_REJECT_SKERR=y

CONFIG_NF_NAT_IPV4=y

CONFIG_IP_NF_TARGET_MASQUERADE=y

CONFIG_IP_NF_TARGET_NETMAP=y
@@ -176,6 +181,7 @@ CONFIG_NF_CONNTRACK_IPV6=y 
CONFIG_IP6_NF_IPTABLES=y

CONFIG_IP6_NF_FILTER=y

CONFIG_IP6_NF_TARGET_REJECT=y

CONFIG_IP6_NF_TARGET_REJECT_SKERR=y

CONFIG_IP6_NF_MANGLE=y

CONFIG_IP6_NF_RAW=y

CONFIG_BRIDGE_NF_EBTABLES=y
@@ -196,6 +202,9 @@ CONFIG_NET_EMATCH_META=y 
CONFIG_NET_EMATCH_TEXT=y

CONFIG_NET_CLS_ACT=y

CONFIG_BT=y

CONFIG_RMNET_DATA=y

CONFIG_RMNET_DATA_FC=y

CONFIG_RMNET_DATA_DEBUG_PKT=y

CONFIG_BT_RFCOMM=y

CONFIG_BT_RFCOMM_TTY=y

CONFIG_BT_BNEP=y
@@ -511,6 +520,7 @@ CONFIG_SECURITY_NETWORK=y 
CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_ARC4=y

CONFIG_CRYPTO_TWOFISH=y

CONFIG_CRYPTO_XTS=y

CONFIG_CRYPTO_DEV_QCRYPTO=y

CONFIG_CRYPTO_DEV_QCE=y

CONFIG_CRYPTO_DEV_QCEDEV=y

arch/arm/configs/msm8909_defconfig

+8 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ CONFIG_IPV6_MIP6=y 
CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_IPV6_SUBTREES=y

CONFIG_NETFILTER=y

CONFIG_NETFILTER_XTABLES=y

CONFIG_NETFILTER_NETLINK_LOG=y

CONFIG_NF_CONNTRACK=y

CONFIG_NF_CONNTRACK_SECMARK=y
@@ -156,6 +157,7 @@ CONFIG_NETFILTER_XT_MATCH_STATISTIC=y 
CONFIG_NETFILTER_XT_MATCH_STRING=y

CONFIG_NETFILTER_XT_MATCH_TIME=y

CONFIG_NETFILTER_XT_MATCH_U32=y

CONFIG_NETFILTER_XT_MATCH_ESP=y

CONFIG_NF_CONNTRACK_IPV4=y

CONFIG_IP_NF_IPTABLES=y

CONFIG_IP_NF_MATCH_AH=y
@@ -163,6 +165,7 @@ CONFIG_IP_NF_MATCH_ECN=y 
CONFIG_IP_NF_MATCH_TTL=y

CONFIG_IP_NF_FILTER=y

CONFIG_IP_NF_TARGET_REJECT=y

CONFIG_IP_NF_TARGET_REJECT_SKERR=y

CONFIG_NF_NAT_IPV4=y

CONFIG_IP_NF_TARGET_MASQUERADE=y

CONFIG_IP_NF_TARGET_NETMAP=y
@@ -177,6 +180,7 @@ CONFIG_NF_CONNTRACK_IPV6=y 
CONFIG_IP6_NF_IPTABLES=y

CONFIG_IP6_NF_FILTER=y

CONFIG_IP6_NF_TARGET_REJECT=y

CONFIG_IP6_NF_TARGET_REJECT_SKERR=y

CONFIG_IP6_NF_MANGLE=y

CONFIG_IP6_NF_RAW=y

CONFIG_BRIDGE_NF_EBTABLES=y
@@ -197,6 +201,9 @@ CONFIG_NET_EMATCH_META=y 
CONFIG_NET_EMATCH_TEXT=y

CONFIG_NET_CLS_ACT=y

CONFIG_BT=y

CONFIG_RMNET_DATA=y

CONFIG_RMNET_DATA_FC=y

CONFIG_RMNET_DATA_DEBUG_PKT=y

CONFIG_BT_RFCOMM=y

CONFIG_BT_RFCOMM_TTY=y

CONFIG_BT_BNEP=y
@@ -526,6 +533,7 @@ CONFIG_SECURITY_NETWORK=y 
CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_ARC4=y

CONFIG_CRYPTO_TWOFISH=y

CONFIG_CRYPTO_XTS=y

CONFIG_CRYPTO_DEV_QCRYPTO=y

CONFIG_CRYPTO_DEV_QCE=y

CONFIG_CRYPTO_DEV_QCEDEV=y