Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit ebd4642ee412ba3719274d80658a4c785fc43678

Authored by Krzysztof Kozlowski
Committed by Greg Kroah-Hartman
1 parent 69f3df1fd0
Exists in smarct4x-processor-sdk-04.01.00.06 and in 1 other branch smarct3x-processor-sdk-04.01.00.06

ARM: s3c2410_defconfig: Fix invalid values for NF_CT_PROTO_* 

[ 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>

Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff

arch/arm/configs/s3c2410_defconfig
Diff comments   View file @ ebd4642
... ... @@ -86,9 +86,9 @@
86 86 CONFIG_NETFILTER=y
87 87 CONFIG_NF_CONNTRACK=m
88 88 CONFIG_NF_CONNTRACK_EVENTS=y
89   -CONFIG_NF_CT_PROTO_DCCP=m
90   -CONFIG_NF_CT_PROTO_SCTP=m
91   -CONFIG_NF_CT_PROTO_UDPLITE=m
  89 +CONFIG_NF_CT_PROTO_DCCP=y
  90 +CONFIG_NF_CT_PROTO_SCTP=y
  91 +CONFIG_NF_CT_PROTO_UDPLITE=y
92 92 CONFIG_NF_CONNTRACK_AMANDA=m
93 93 CONFIG_NF_CONNTRACK_FTP=m
94 94 CONFIG_NF_CONNTRACK_H323=m