From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 24 Sep 2016 21:37:54 +0000 (+0200)
Subject: kernel: remove duplicate br-netfilter file and Kconfig symbol from kmod-ebtables
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=ce89535bce052c9463e32ad83b950d00c988c21f;p=openwrt%2Fstaging%2Fblogic.git

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

diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk
index 6876f245dfeb..ccbd20a64349 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