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

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

Merge "defconfig: msm8909w: Mandatory config for msm8909w"

parents 7c1270b2 1ef634df

arch/arm/configs/msm8909w-perf_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ CONFIG_IP_MULTIPLE_TABLES=y 
CONFIG_IP_ROUTE_VERBOSE=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_NET_IPVTI=y

CONFIG_INET_AH=y

CONFIG_INET_ESP=y

CONFIG_INET_IPCOMP=y
@@ -91,6 +92,7 @@ CONFIG_INET6_AH=y 
CONFIG_INET6_ESP=y

CONFIG_INET6_IPCOMP=y

CONFIG_IPV6_MIP6=y

CONFIG_IPV6_VTI=y

CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_IPV6_SUBTREES=y

CONFIG_NETFILTER=y
@@ -469,6 +471,7 @@ CONFIG_NLS_ISO8859_1=y 
CONFIG_PRINTK_TIME=y

CONFIG_DEBUG_INFO=y

CONFIG_FRAME_WARN=2048

CONFIG_MAGIC_SYSRQ=y

CONFIG_PAGE_EXTENSION=y

CONFIG_PANIC_ON_RECURSIVE_FAULT=y

CONFIG_WQ_WATCHDOG=y
@@ -487,6 +490,7 @@ CONFIG_LSM_MMAP_MIN_ADDR=4096 
CONFIG_HARDENED_USERCOPY=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SMACK=y

CONFIG_CRYPTO_GCM=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_TWOFISH=y

arch/arm/configs/msm8909w_defconfig

+6 −1
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ CONFIG_IP_MULTIPLE_TABLES=y 
CONFIG_IP_ROUTE_VERBOSE=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_NET_IPVTI=y

CONFIG_INET_AH=y

CONFIG_INET_ESP=y

CONFIG_INET_IPCOMP=y
@@ -92,6 +93,7 @@ CONFIG_INET6_AH=y 
CONFIG_INET6_ESP=y

CONFIG_INET6_IPCOMP=y

CONFIG_IPV6_MIP6=y

CONFIG_IPV6_VTI=y

CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_IPV6_SUBTREES=y

CONFIG_NETFILTER=y
@@ -345,6 +347,8 @@ CONFIG_USB_CONFIGFS_NCM=y 
CONFIG_USB_CONFIGFS_RMNET_BAM=y

CONFIG_USB_CONFIGFS_MASS_STORAGE=y

CONFIG_USB_CONFIGFS_F_FS=y

CONFIG_USB_CONFIGFS_F_MTP=y

CONFIG_USB_CONFIGFS_F_PTP=y

CONFIG_USB_CONFIGFS_F_ACC=y

CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y

CONFIG_USB_CONFIGFS_UEVENT=y
@@ -464,6 +468,7 @@ CONFIG_DEBUG_INFO=y 
CONFIG_FRAME_WARN=2048

CONFIG_PAGE_OWNER=y

CONFIG_PAGE_OWNER_ENABLE_DEFAULT=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_SLUB_DEBUG_PANIC_ON=y

CONFIG_DEBUG_STACK_USAGE=y

CONFIG_DEBUG_MEMORY_INIT=y
@@ -514,7 +519,7 @@ CONFIG_LSM_MMAP_MIN_ADDR=4096 
CONFIG_HARDENED_USERCOPY=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SMACK=y

CONFIG_CRYPTO_CTR=y

CONFIG_CRYPTO_GCM=y

CONFIG_CRYPTO_XTS=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_MD4=y