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

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

Merge "defconfig: msm4.9: Added L2TP kernel auto config support."

parents 087b3b1c 8f949b60

arch/arm/configs/sdxpoorwills-auto-perf_defconfig

+7 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y 
CONFIG_NETFILTER_XT_MATCH_DSCP=y

CONFIG_NETFILTER_XT_MATCH_ESP=y

CONFIG_NETFILTER_XT_MATCH_IPRANGE=y

# CONFIG_NETFILTER_XT_MATCH_L2TP is not set

CONFIG_NETFILTER_XT_MATCH_LIMIT=y

CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y

CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
@@ -152,6 +153,11 @@ CONFIG_BRIDGE_EBT_IP6=y 
CONFIG_BRIDGE_EBT_ARPREPLY=y

CONFIG_BRIDGE_EBT_DNAT=y

CONFIG_BRIDGE_EBT_SNAT=y

CONFIG_L2TP=y

CONFIG_L2TP_DEBUGFS=y

CONFIG_L2TP_V3=y

CONFIG_L2TP_IP=y

CONFIG_L2TP_ETH=y

CONFIG_BRIDGE=y

CONFIG_VLAN_8021Q=y

CONFIG_NET_SCHED=y
@@ -209,6 +215,7 @@ CONFIG_KS8851=y 
# CONFIG_NET_VENDOR_STMICRO is not set

CONFIG_AT803X_PHY=y

CONFIG_PPP=y

CONFIG_PPPOL2TP=y

CONFIG_PPP_ASYNC=y

CONFIG_USB_USBNET=y

CONFIG_USB_NET_SMSC75XX=y

arch/arm/configs/sdxpoorwills-auto_defconfig

+7 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y 
CONFIG_NETFILTER_XT_MATCH_DSCP=y

CONFIG_NETFILTER_XT_MATCH_ESP=y

CONFIG_NETFILTER_XT_MATCH_IPRANGE=y

# CONFIG_NETFILTER_XT_MATCH_L2TP is not set

CONFIG_NETFILTER_XT_MATCH_LIMIT=y

CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y

CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
@@ -154,6 +155,11 @@ CONFIG_BRIDGE_EBT_IP6=y 
CONFIG_BRIDGE_EBT_ARPREPLY=y

CONFIG_BRIDGE_EBT_DNAT=y

CONFIG_BRIDGE_EBT_SNAT=y

CONFIG_L2TP=y

CONFIG_L2TP_DEBUGFS=y

CONFIG_L2TP_V3=y

CONFIG_L2TP_IP=y

CONFIG_L2TP_ETH=y

CONFIG_BRIDGE=y

CONFIG_VLAN_8021Q=y

CONFIG_NET_SCHED=y
@@ -203,6 +209,7 @@ CONFIG_KS8851=y 
# CONFIG_NET_VENDOR_STMICRO is not set

CONFIG_AT803X_PHY=y

CONFIG_PPP=y

CONFIG_PPPOL2TP=y

CONFIG_PPP_ASYNC=y

CONFIG_USB_USBNET=y

CONFIG_USB_NET_SMSC75XX=y