aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2015-04-05 07:40:38 +0000
committerJohn Crispin <blogic@openwrt.org>2015-04-05 07:40:38 +0000
commit8493855a6c533b9782bafd0b7914464e538cce06 (patch)
treefc631a82b753fe18410ff82ac171744dba9d319b /target/linux
parent37e86d3fcf4eb101cbdbe27a48962070c01f2f97 (diff)
downloadupstream-8493855a6c533b9782bafd0b7914464e538cce06.tar.gz
upstream-8493855a6c533b9782bafd0b7914464e538cce06.tar.bz2
upstream-8493855a6c533b9782bafd0b7914464e538cce06.zip
kernel: CONFIG_BRIDGE should not be overridden
this breaks ebtables, netfilter, ... during fullbuilds Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45276 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/mcs814x/config-3.141
-rw-r--r--target/linux/mcs814x/config-3.181
-rw-r--r--target/linux/xburst/config-3.181
3 files changed, 0 insertions, 3 deletions
diff --git a/target/linux/mcs814x/config-3.14 b/target/linux/mcs814x/config-3.14
index 80118f624b..0830c24b13 100644
--- a/target/linux/mcs814x/config-3.14
+++ b/target/linux/mcs814x/config-3.14
@@ -18,7 +18,6 @@ CONFIG_ARM_NR_BANKS=8
# CONFIG_ARPD is not set
CONFIG_BCMA_POSSIBLE=y
CONFIG_BINFMT_MISC=y
-# CONFIG_BRIDGE is not set
# CONFIG_CACHE_L2X0 is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_CLKDEV_LOOKUP=y
diff --git a/target/linux/mcs814x/config-3.18 b/target/linux/mcs814x/config-3.18
index 570350c82d..87a8382d87 100644
--- a/target/linux/mcs814x/config-3.18
+++ b/target/linux/mcs814x/config-3.18
@@ -25,7 +25,6 @@ CONFIG_ARM_APPENDED_DTB=y
CONFIG_ARM_L1_CACHE_SHIFT=5
# CONFIG_ARM_THUMB is not set
CONFIG_BINFMT_MISC=y
-# CONFIG_BRIDGE is not set
# CONFIG_CACHE_L2X0 is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_CLKDEV_LOOKUP=y
diff --git a/target/linux/xburst/config-3.18 b/target/linux/xburst/config-3.18
index b91918fe3a..fbc2891673 100644
--- a/target/linux/xburst/config-3.18
+++ b/target/linux/xburst/config-3.18
@@ -18,7 +18,6 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y
# CONFIG_BACKLIGHT_PWM is not set
CONFIG_BATTERY_JZ4740=y
# CONFIG_BLK_DEV_INITRD is not set
-# CONFIG_BRIDGE is not set
CONFIG_CHARGER_GPIO=y
CONFIG_CLONE_BACKWARDS=y
CONFIG_CONFIGFS_FS=y