netfilter: fix file conflicts between kmod-ipt- and kmod-nft- packages

[openwrt/staging/blogic.git] / target / linux / generic / config-4.1

diff --git a/target/linux/generic/config-4.1 b/target/linux/generic/config-4.1
index 3cedf848a6ef3e46fc61358f40223508ce109e2d..0b5eccb7eac899f84681a7aa531c752521e24bd9 100644 (file)
--- a/target/linux/generic/config-4.1
+++ b/target/linux/generic/config-4.1
@@ -2717,6 +2717,7 @@ CONFIG_NF_CONNTRACK_PROCFS=y
 # CONFIG_NF_NAT_SNMP_BASIC is not set
 # CONFIG_NF_NAT_TFTP is not set
 # CONFIG_NF_REJECT_IPV4 is not set
+# CONFIG_NF_REJECT_IPV6 is not set
 # CONFIG_NF_TABLES is not set
 # CONFIG_NI52 is not set
 # CONFIG_NI65 is not set
@@ -3938,6 +3939,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SPI_FSL_ESPI is not set
 # CONFIG_SPI_FSL_SPI is not set
 # CONFIG_SPI_GPIO is not set
+# CONFIG_SPI_GPIO_OLD is not set
 # CONFIG_SPI_IMG_SPFI is not set
 # CONFIG_SPI_LM70_LLP is not set
 # CONFIG_SPI_MASTER is not set