diff options
author | Felix Fietkau <nbd@openwrt.org> | 2007-06-21 17:53:08 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2007-06-21 17:53:08 +0000 |
commit | 6288d602df9b8d992d4f894c506a758c8cde822a (patch) | |
tree | e7885f2f0bbe32ca3bcd11a770d948a47fc76523 /target/linux/generic-2.6/config-2.6.22 | |
parent | 283d10a870e3a3f2e339ed654c11b41e14bbd19d (diff) | |
download | upstream-6288d602df9b8d992d4f894c506a758c8cde822a.tar.gz upstream-6288d602df9b8d992d4f894c506a758c8cde822a.tar.bz2 upstream-6288d602df9b8d992d4f894c506a758c8cde822a.zip |
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-2.6.22')
-rw-r--r-- | target/linux/generic-2.6/config-2.6.22 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic-2.6/config-2.6.22 b/target/linux/generic-2.6/config-2.6.22 index 5fac0a48f5..32782f5e91 100644 --- a/target/linux/generic-2.6/config-2.6.22 +++ b/target/linux/generic-2.6/config-2.6.22 @@ -140,7 +140,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 |