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

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

Merge "ARCH: arm: pmipv6 kernel changes"

parents e0b9bff3 e9a8c132

arch/arm/configs/sdxpoorwills-perf_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -44,9 +44,13 @@ CONFIG_INET=y 
CONFIG_IP_MULTICAST=y

CONFIG_IP_ADVANCED_ROUTER=y

CONFIG_IP_MULTIPLE_TABLES=y

CONFIG_NET_IPGRE_DEMUX=y

CONFIG_NET_IPGRE=y

CONFIG_IP_MROUTE=y

CONFIG_IP_MROUTE_MULTIPLE_TABLES=y

CONFIG_IP_PIMSM_V2=y

CONFIG_IPV6_MIP6=y

CONFIG_IPV6_GRE=y

CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_IPV6_SUBTREES=y

CONFIG_IPV6_MROUTE=y

arch/arm/configs/sdxpoorwills_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -46,9 +46,13 @@ CONFIG_INET=y 
CONFIG_IP_MULTICAST=y

CONFIG_IP_ADVANCED_ROUTER=y

CONFIG_IP_MULTIPLE_TABLES=y

CONFIG_NET_IPGRE_DEMUX=y

CONFIG_NET_IPGRE=y

CONFIG_IP_MROUTE=y

CONFIG_IP_MROUTE_MULTIPLE_TABLES=y

CONFIG_IP_PIMSM_V2=y

CONFIG_IPV6_MIP6=y

CONFIG_IPV6_GRE=y

CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_IPV6_SUBTREES=y

CONFIG_IPV6_MROUTE=y