From 10a71220f241346be687344d12a72074ad68853a Mon Sep 17 00:00:00 2001 From: John Crispin <john@openwrt.org> Date: Sun, 5 Apr 2015 07:40:38 +0000 Subject: [PATCH] kernel: CONFIG_BRIDGE should not be overridden this breaks ebtables, netfilter, ... during fullbuilds Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 45276 --- target/linux/mcs814x/config-3.14 | 1 - target/linux/mcs814x/config-3.18 | 1 - target/linux/xburst/config-3.18 | 1 - 3 files changed, 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 -- GitLab