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

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

Merge "defconfig: remove paranoid network from sdxpoorwills defconfig"

parents 22e3f2cc be2411bf

arch/arm/configs/sdxpoorwills-auto-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ CONFIG_IPV6_SUBTREES=y 
CONFIG_IPV6_MROUTE=y

CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y

CONFIG_IPV6_PIMSM_V2=y

# CONFIG_ANDROID_PARANOID_NETWORK is not set

CONFIG_NETFILTER=y

CONFIG_NETFILTER_DEBUG=y

CONFIG_NF_CONNTRACK=y

arch/arm/configs/sdxpoorwills-auto_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ CONFIG_IPV6_SUBTREES=y 
CONFIG_IPV6_MROUTE=y

CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y

CONFIG_IPV6_PIMSM_V2=y

# CONFIG_ANDROID_PARANOID_NETWORK is not set

CONFIG_NETFILTER=y

CONFIG_NETFILTER_DEBUG=y

CONFIG_NF_CONNTRACK=y

arch/arm/configs/sdxpoorwills-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ CONFIG_IPV6_SUBTREES=y 
CONFIG_IPV6_MROUTE=y

CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y

CONFIG_IPV6_PIMSM_V2=y

# CONFIG_ANDROID_PARANOID_NETWORK is not set

CONFIG_NETFILTER=y

CONFIG_NETFILTER_DEBUG=y

CONFIG_NF_CONNTRACK=y

arch/arm/configs/sdxpoorwills_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ CONFIG_IPV6_SUBTREES=y 
CONFIG_IPV6_MROUTE=y

CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y

CONFIG_IPV6_PIMSM_V2=y

# CONFIG_ANDROID_PARANOID_NETWORK is not set

CONFIG_NETFILTER=y

CONFIG_NETFILTER_DEBUG=y

CONFIG_NF_CONNTRACK=y