diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2017-08-23 07:37:59 +0200 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-08-28 14:10:20 +0200 |
| commit | 886a3bacb7f004cc82e96a9e2c308424db4af397 (patch) | |
| tree | 88683e8c74b937e1f6c6c54c5b4dfa08672863cd /arch/powerpc/configs/ppc6xx_defconfig | |
| parent | powerpc/configs/6xx: Drop removed CONFIG_BLK_DEV_HD (diff) | |
| download | linux-886a3bacb7f004cc82e96a9e2c308424db4af397.tar.xz linux-886a3bacb7f004cc82e96a9e2c308424db4af397.zip | |
powerpc/configs/6xx: Drop no longer needed CONFIG_NF_CONNTRACK_PROC_COMPAT
Since commit adf0516845bc ("netfilter: remove ip_conntrack* sysctl
compat code") we no longer need to set CONFIG_NF_CONNTRACK_PROC_COMPAT
in our 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 e42ef735fab5..8baa79eb7a4d 100644 --- a/arch/powerpc/configs/ppc6xx_defconfig +++ b/arch/powerpc/configs/ppc6xx_defconfig @@ -193,7 +193,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m CONFIG_NETFILTER_XT_MATCH_TIME=m CONFIG_NETFILTER_XT_MATCH_U32=m CONFIG_NF_CONNTRACK_IPV4=m -# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MATCH_AH=m CONFIG_IP_NF_MATCH_ECN=m |