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 | b94b11e11eee8b43ec951f46afc446bfaaebb87c (patch) | |
| tree | 3992ad2db6f7e9e3e211f36677cfa49cc2bbb222 /target/linux/generic-2.6 | |
| parent | 02619c31b588a2616e0cffdb760cf352dac6cd8b (diff) | |
| download | upstream-b94b11e11eee8b43ec951f46afc446bfaaebb87c.tar.gz upstream-b94b11e11eee8b43ec951f46afc446bfaaebb87c.tar.bz2 upstream-b94b11e11eee8b43ec951f46afc446bfaaebb87c.zip | |
minor kernel config sync
SVN-Revision: 7690
Diffstat (limited to 'target/linux/generic-2.6')
| -rw-r--r-- | target/linux/generic-2.6/config-2.6.22 | 2 | ||||
| -rw-r--r-- | target/linux/generic-2.6/config-template | 2 |
2 files changed, 2 insertions, 2 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 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 |