kernel: CONFIG_BRIDGE should not be overridden

this breaks ebtables, netfilter, ... during fullbuilds

Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 45276

diff --git a/target/linux/mcs814x/config-3.14 b/target/linux/mcs814x/config-3.14
index 80118f624ba938b72106a582bf7d5d8b6f8ce5fd..0830c24b13e596dda1ee60dfc531b97dbe1aeccd 100644 (file)
--- 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 570350c82d66db3796037f8b06f6bb3528dc8fb1..87a8382d8791f2eb2f583d88f93e26e7c326d322 100644 (file)
--- 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 b91918fe3afafdcf0426b386f041e9b422bda3e9..fbc2891673b906d408081cdcf6d97c639101446b 100644 (file)
--- 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