From b94b11e11eee8b43ec951f46afc446bfaaebb87c Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 21 Jun 2007 17:53:08 +0000 Subject: minor kernel config sync SVN-Revision: 7690 --- target/linux/generic-2.6/config-2.6.22 | 2 +- target/linux/generic-2.6/config-template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'target/linux/generic-2.6') diff --git a/target/linux/generic-2.6/config-2.6.22 b/target/linux/generic-2.6/config-2.6.22 index 5fac0a4..32782f5 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 60f5bae..1a88a3e 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 -- cgit v1.1