diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2017-08-23 15:37:28 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-08-28 22:10:04 +1000 |
| commit | b8465a6ae5cde49fe76180a35f7863eb17c32ba2 (patch) | |
| tree | e1d62a98ee1dbf907567675c656932f3fd89eeb7 /arch/powerpc/configs/ppc6xx_defconfig | |
| parent | 360426fb8cb42c6d7f2ced20eace81f487ac5d27 (diff) | |
| download | linux-b8465a6ae5cde49fe76180a35f7863eb17c32ba2.tar.gz | |
powerpc/configs: Update for CONFIG_NF_CT_PROTO_(SCTP|UDPLITE)=y
In commit a85406afeb3e ("netfilter: conntrack: built-in support for
SCTP"), NF_CT_PROTO_SCTP switched from tristate to bool and became
default y. Similarly in commit 9b91c96c5d1f ("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: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/configs/ppc6xx_defconfig')
| -rw-r--r-- | arch/powerpc/configs/ppc6xx_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig index 5d8fa80d7add..bad3e04163d0 100644 --- a/arch/powerpc/configs/ppc6xx_defconfig +++ b/arch/powerpc/configs/ppc6xx_defconfig @@ -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 |