| From foo@baz Fri Aug 4 15:15:01 PDT 2017 |
| From: Krzysztof Kozlowski <krzk@kernel.org> |
| Date: Thu, 29 Dec 2016 14:41:05 +0200 |
| Subject: ARM: s3c2410_defconfig: Fix invalid values for NF_CT_PROTO_* |
| |
| From: Krzysztof Kozlowski <krzk@kernel.org> |
| |
| |
| [ Upstream commit 3ef01c968fbfb21c2f16281445d30a865ee4412c ] |
| |
| NF_CT_PROTO_DCCP/SCTP/UDPLITE were switched from tristate to boolean so |
| defconfig needs to be adjusted to silence warnings: |
| warning: symbol value 'm' invalid for NF_CT_PROTO_DCCP |
| warning: symbol value 'm' invalid for NF_CT_PROTO_SCTP |
| warning: symbol value 'm' invalid for NF_CT_PROTO_UDPLITE |
| |
| Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> |
| Signed-off-by: Sasha Levin <alexander.levin@verizon.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| arch/arm/configs/s3c2410_defconfig | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/arch/arm/configs/s3c2410_defconfig |
| +++ b/arch/arm/configs/s3c2410_defconfig |
| @@ -86,9 +86,9 @@ CONFIG_IPV6_TUNNEL=m |
| CONFIG_NETFILTER=y |
| CONFIG_NF_CONNTRACK=m |
| CONFIG_NF_CONNTRACK_EVENTS=y |
| -CONFIG_NF_CT_PROTO_DCCP=m |
| -CONFIG_NF_CT_PROTO_SCTP=m |
| -CONFIG_NF_CT_PROTO_UDPLITE=m |
| +CONFIG_NF_CT_PROTO_DCCP=y |
| +CONFIG_NF_CT_PROTO_SCTP=y |
| +CONFIG_NF_CT_PROTO_UDPLITE=y |
| CONFIG_NF_CONNTRACK_AMANDA=m |
| CONFIG_NF_CONNTRACK_FTP=m |
| CONFIG_NF_CONNTRACK_H323=m |
