summaryrefslogtreecommitdiff
path: root/target/linux/generic-2.6/config-template
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-06-21 17:53:08 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-06-21 17:53:08 +0000
commitebd093f2fa1855b10efdc70772e1024dd37b1a4a (patch)
treee7885f2f0bbe32ca3bcd11a770d948a47fc76523 /target/linux/generic-2.6/config-template
parent631f7403d8703a4e3c570a5f5b0507102b3259a1 (diff)
minor kernel config sync
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7690 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/config-template')
-rw-r--r--target/linux/generic-2.6/config-template2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic-2.6/config-template b/target/linux/generic-2.6/config-template
index 60f5bae06f..1a88a3ef12 100644
--- a/target/linux/generic-2.6/config-template
+++ b/target/linux/generic-2.6/config-template
@@ -137,7 +137,7 @@ CONFIG_BRIDGE_EBT_T_FILTER=m
CONFIG_BRIDGE_EBT_T_NAT=m
CONFIG_BRIDGE_EBT_ULOG=m
CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_NETFILTER=y
+# CONFIG_BRIDGE_NETFILTER is not set
CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BROKEN_ON_SMP=y
CONFIG_BSD_DISKLABEL=y