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

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

Merge "defconfig: msm8994: Enable defconfig options based on Android base config"

parents 88a7f04b 17e40e65

arch/arm64/configs/msm8994-perf_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y 
CONFIG_NETFILTER_XT_TARGET_NOTRACK=y

CONFIG_NETFILTER_XT_TARGET_TPROXY=y

CONFIG_NETFILTER_XT_TARGET_TRACE=y

CONFIG_NETFILTER_XT_TARGET_TCPMSS=y

CONFIG_NETFILTER_XT_MATCH_COMMENT=y

CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y

CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
@@ -223,7 +224,10 @@ CONFIG_RNDIS_IPA=y 
CONFIG_PPP=y

CONFIG_PPP_BSDCOMP=y

CONFIG_PPP_DEFLATE=y

CONFIG_PPP_MPPE=y

CONFIG_PPPOE=y

CONFIG_PPPOLAC=y

CONFIG_PPPOPNS=y

CONFIG_PPP_ASYNC=y

CONFIG_PPP_SYNC_TTY=y

CONFIG_USB_USBNET=y
@@ -490,7 +494,6 @@ CONFIG_SECURITY_NETWORK=y 
CONFIG_CRYPTO_NULL=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_ARC4=y

CONFIG_CRYPTO_TWOFISH=y

CONFIG_CRYPTO_DEV_QCRYPTO=y

CONFIG_CRYPTO_DEV_QCE=y

arch/arm64/configs/msm8994_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y 
CONFIG_NETFILTER_XT_TARGET_NOTRACK=y

CONFIG_NETFILTER_XT_TARGET_TPROXY=y

CONFIG_NETFILTER_XT_TARGET_TRACE=y

CONFIG_NETFILTER_XT_TARGET_TCPMSS=y

CONFIG_NETFILTER_XT_MATCH_COMMENT=y

CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y

CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
@@ -224,7 +225,10 @@ CONFIG_RNDIS_IPA=y 
CONFIG_PPP=y

CONFIG_PPP_BSDCOMP=y

CONFIG_PPP_DEFLATE=y

CONFIG_PPP_MPPE=y

CONFIG_PPPOE=y

CONFIG_PPPOLAC=y

CONFIG_PPPOPNS=y

CONFIG_PPP_ASYNC=y

CONFIG_PPP_SYNC_TTY=y

CONFIG_USB_USBNET=y
@@ -525,7 +529,6 @@ CONFIG_SECURITY_NETWORK=y 
CONFIG_CRYPTO_NULL=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_ARC4=y

CONFIG_CRYPTO_TWOFISH=y

CONFIG_CRYPTO_DEV_QCRYPTO=y

CONFIG_CRYPTO_DEV_QCE=y