summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2016-09-24 23:37:54 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2016-09-24 23:37:54 +0200
commitce89535bce052c9463e32ad83b950d00c988c21f (patch)
tree6e7e8aa62cef2e28b4eef6b58b73913af82c7e15
parentea288126dbcf11ecf990b858e1c563b24b198327 (diff)
downloadmaster-31e0f0ae-ce89535bce052c9463e32ad83b950d00c988c21f.tar.gz
master-31e0f0ae-ce89535bce052c9463e32ad83b950d00c988c21f.tar.bz2
master-31e0f0ae-ce89535bce052c9463e32ad83b950d00c988c21f.zip
kernel: remove duplicate br-netfilter file and Kconfig symbol from kmod-ebtables
br_netfilter.ko and the corresponding Kconfig symbol are already provided by kmod-br-netfilter, which is a dependency of kmod-ebtables. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-rw-r--r--package/kernel/linux/modules/netfilter.mk7
1 files changed, 2 insertions, 5 deletions
diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk
index 6876f245df..ccbd20a643 100644
--- a/package/kernel/linux/modules/netfilter.mk
+++ b/package/kernel/linux/modules/netfilter.mk
@@ -661,11 +661,8 @@ define KernelPackage/ebtables
SUBMENU:=$(NF_MENU)
TITLE:=Bridge firewalling modules
DEPENDS:=+kmod-ipt-core +kmod-bridge +kmod-br-netfilter
- FILES:= \
- $(LINUX_DIR)/net/bridge/br_netfilter.ko \
- $(foreach mod,$(EBTABLES-m),$(LINUX_DIR)/net/$(mod).ko)
- KCONFIG:=CONFIG_BRIDGE_NETFILTER \
- $(KCONFIG_EBTABLES)
+ FILES:=$(foreach mod,$(EBTABLES-m),$(LINUX_DIR)/net/$(mod).ko)
+ KCONFIG:=$(KCONFIG_EBTABLES)
AUTOLOAD:=$(call AutoProbe,$(notdir $(EBTABLES-m)))
endef