aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-06-09 19:48:32 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-06-09 19:48:32 +0000
commit8c2198b92bafcc3518443e67ed7cc167ef5d6dbe (patch)
tree6d105b2315caeb3c90c982a5be41a96e22ecfe1f
parent9eae8e7e706a61039e5e6a25922a16d397834f91 (diff)
downloadupstream-8c2198b92bafcc3518443e67ed7cc167ef5d6dbe.tar.gz
upstream-8c2198b92bafcc3518443e67ed7cc167ef5d6dbe.tar.bz2
upstream-8c2198b92bafcc3518443e67ed7cc167ef5d6dbe.zip
ar71xx: don't override CONFIG_BRIDGE_* options
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21742 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/ar71xx/config-2.6.342
-rw-r--r--target/linux/ar71xx/config-2.6.352
2 files changed, 0 insertions, 4 deletions
diff --git a/target/linux/ar71xx/config-2.6.34 b/target/linux/ar71xx/config-2.6.34
index 98fdd7c6f9..eec4580e3d 100644
--- a/target/linux/ar71xx/config-2.6.34
+++ b/target/linux/ar71xx/config-2.6.34
@@ -59,8 +59,6 @@ CONFIG_ATHEROS_AR71XX=y
# CONFIG_BCM47XX is not set
# CONFIG_BCM63XX is not set
CONFIG_BITREVERSE=y
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
diff --git a/target/linux/ar71xx/config-2.6.35 b/target/linux/ar71xx/config-2.6.35
index 98fdd7c6f9..eec4580e3d 100644
--- a/target/linux/ar71xx/config-2.6.35
+++ b/target/linux/ar71xx/config-2.6.35
@@ -59,8 +59,6 @@ CONFIG_ATHEROS_AR71XX=y
# CONFIG_BCM47XX is not set
# CONFIG_BCM63XX is not set
CONFIG_BITREVERSE=y
-CONFIG_BRIDGE=m
-CONFIG_BRIDGE_IGMP_SNOOPING=y
# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y