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

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

Merge "defconfig: msm8909: Android O Kernel Upgrade"

parents 08fed7dd afc10677

arch/arm/configs/msm8909-perf_defconfig

+6 −3
Original line number Diff line number Diff line
@@ -69,6 +69,8 @@ CONFIG_NET=y 
CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_XFRM_USER=y

CONFIG_XFRM_STATISTICS=y

CONFIG_NET_KEY=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_ADVANCED_ROUTER=y
@@ -78,8 +80,8 @@ CONFIG_IP_PNP=y 
CONFIG_IP_PNP_DHCP=y

CONFIG_INET_AH=y

CONFIG_INET_ESP=y

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

CONFIG_INET_IPCOMP=y

CONFIG_INET_DIAG_DESTROY=y

CONFIG_IPV6=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_IPV6_ROUTE_INFO=y
@@ -90,6 +92,7 @@ CONFIG_INET6_IPCOMP=y 
CONFIG_IPV6_MIP6=y

CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_IPV6_SUBTREES=y

CONFIG_NETLABEL=y

CONFIG_NETFILTER=y

CONFIG_NETFILTER_DEBUG=y

CONFIG_BRIDGE_NETFILTER=y
@@ -106,7 +109,6 @@ CONFIG_NF_CONNTRACK_IRC=y 
CONFIG_NF_CONNTRACK_NETBIOS_NS=y

CONFIG_NF_CONNTRACK_PPTP=y

CONFIG_NF_CONNTRACK_SANE=y

CONFIG_NF_CONNTRACK_SIP=y

CONFIG_NF_CONNTRACK_TFTP=y

CONFIG_NF_CT_NETLINK=y

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
@@ -119,6 +121,7 @@ CONFIG_NETFILTER_XT_TARGET_MARK=y 
CONFIG_NETFILTER_XT_TARGET_NFLOG=y

CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y

CONFIG_NETFILTER_XT_TARGET_NOTRACK=y

CONFIG_NETFILTER_XT_TARGET_TEE=y

CONFIG_NETFILTER_XT_TARGET_TPROXY=y

CONFIG_NETFILTER_XT_TARGET_TRACE=y

CONFIG_NETFILTER_XT_TARGET_SECMARK=y

arch/arm/configs/msm8909_defconfig

+6 −3
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@ CONFIG_NET=y 
CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_XFRM_USER=y

CONFIG_XFRM_STATISTICS=y

CONFIG_NET_KEY=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_ADVANCED_ROUTER=y
@@ -82,8 +84,8 @@ CONFIG_IP_PNP=y 
CONFIG_IP_PNP_DHCP=y

CONFIG_INET_AH=y

CONFIG_INET_ESP=y

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

CONFIG_INET_IPCOMP=y

CONFIG_INET_DIAG_DESTROY=y

CONFIG_IPV6=y

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_IPV6_ROUTE_INFO=y
@@ -94,6 +96,7 @@ CONFIG_INET6_IPCOMP=y 
CONFIG_IPV6_MIP6=y

CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_IPV6_SUBTREES=y

CONFIG_NETLABEL=y

CONFIG_NETFILTER=y

CONFIG_NETFILTER_DEBUG=y

CONFIG_BRIDGE_NETFILTER=y
@@ -110,7 +113,6 @@ CONFIG_NF_CONNTRACK_IRC=y 
CONFIG_NF_CONNTRACK_NETBIOS_NS=y

CONFIG_NF_CONNTRACK_PPTP=y

CONFIG_NF_CONNTRACK_SANE=y

CONFIG_NF_CONNTRACK_SIP=y

CONFIG_NF_CONNTRACK_TFTP=y

CONFIG_NF_CT_NETLINK=y

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
@@ -123,6 +125,7 @@ CONFIG_NETFILTER_XT_TARGET_MARK=y 
CONFIG_NETFILTER_XT_TARGET_NFLOG=y

CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y

CONFIG_NETFILTER_XT_TARGET_NOTRACK=y

CONFIG_NETFILTER_XT_TARGET_TEE=y

CONFIG_NETFILTER_XT_TARGET_TPROXY=y

CONFIG_NETFILTER_XT_TARGET_TRACE=y

CONFIG_NETFILTER_XT_TARGET_SECMARK=y