aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6
diff options
context:
space:
mode:
authorPeter Denison <openwrt@marshadder.org>2008-05-20 21:21:23 +0000
committerPeter Denison <openwrt@marshadder.org>2008-05-20 21:21:23 +0000
commit19f15b44ea00941e174723ff0732404289282204 (patch)
treef21a6fa53b87626e0d318e07463ca73572d16b3d /target/linux/generic-2.6
parent21401f537a160cc2dcbc948bf1fd5858f3a985a9 (diff)
downloadupstream-19f15b44ea00941e174723ff0732404289282204.tar.gz
upstream-19f15b44ea00941e174723ff0732404289282204.tar.bz2
upstream-19f15b44ea00941e174723ff0732404289282204.zip
Update generic-2.6 and brcm47xx 2.6.25 configs
SVN-Revision: 11227
Diffstat (limited to 'target/linux/generic-2.6')
-rw-r--r--target/linux/generic-2.6/config-2.6.254
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic-2.6/config-2.6.25 b/target/linux/generic-2.6/config-2.6.25
index f0ce4d30ed..f9b8523e58 100644
--- a/target/linux/generic-2.6/config-2.6.25
+++ b/target/linux/generic-2.6/config-2.6.25
@@ -544,7 +544,7 @@ CONFIG_IP6_NF_MATCH_RT=m
CONFIG_IP6_NF_QUEUE=m
CONFIG_IP6_NF_RAW=m
CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_TARGET_IMQ=m
+# CONFIG_IP6_NF_TARGET_IMQ is not set
CONFIG_IP6_NF_TARGET_LOG=m
CONFIG_IP6_NF_TARGET_REJECT=m
CONFIG_IP6_NF_TARGET_ROUTE=m
@@ -634,7 +634,7 @@ CONFIG_IP_NF_SET_PORTMAP=m
CONFIG_IP_NF_SIP=m
# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_IMQ=m
+# CONFIG_IP_NF_TARGET_IMQ is not set
CONFIG_IP_NF_TARGET_LOG=m
CONFIG_IP_NF_TARGET_MASQUERADE=y
CONFIG_IP_NF_TARGET_NETMAP=m