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

Commit b8465a6a authored by Michael Ellerman's avatar Michael Ellerman
Browse files

powerpc/configs: Update for CONFIG_NF_CT_PROTO_(SCTP|UDPLITE)=y 



In commit a85406af ("netfilter: conntrack: built-in support for
SCTP"), NF_CT_PROTO_SCTP switched from tristate to bool and became
default y. Similarly in commit 9b91c96c ("netfilter: conntrack:
built-in support for UDPlite"), NF_CT_PROTO_UDPLITE switched from
tristate to bool and became default y.

We had a few configs which set them to =m, which is no longer valid.
We don't need to change them to =y because both symbols are default y
and are enabled automatically based on the other symbols in the
affected defconfigs.

Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 360426fb

arch/powerpc/configs/linkstation_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ CONFIG_IP_PNP_BOOTP=y 
# CONFIG_IPV6 is not set

CONFIG_NETFILTER=y

CONFIG_NF_CONNTRACK=m

CONFIG_NF_CT_PROTO_SCTP=m

CONFIG_NF_CONNTRACK_AMANDA=m

CONFIG_NF_CONNTRACK_FTP=m

CONFIG_NF_CONNTRACK_H323=m

arch/powerpc/configs/mvme5100_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ CONFIG_IP_PNP_BOOTP=y 
# CONFIG_IPV6 is not set

CONFIG_NETFILTER=y

CONFIG_NF_CONNTRACK=m

CONFIG_NF_CT_PROTO_SCTP=m

CONFIG_NF_CONNTRACK_AMANDA=m

CONFIG_NF_CONNTRACK_FTP=m

CONFIG_NF_CONNTRACK_H323=m

arch/powerpc/configs/ppc6xx_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -140,7 +140,6 @@ CONFIG_NETFILTER=y 
CONFIG_NF_CONNTRACK=m

CONFIG_NF_CONNTRACK_SECMARK=y

CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_NF_CT_PROTO_UDPLITE=m

CONFIG_NF_CONNTRACK_AMANDA=m

CONFIG_NF_CONNTRACK_FTP=m

CONFIG_NF_CONNTRACK_H323=m