diff options
author | John Crispin <john@openwrt.org> | 2015-04-05 07:40:38 +0000 |
---|---|---|
committer | John Crispin <john@openwrt.org> | 2015-04-05 07:40:38 +0000 |
commit | 10a71220f241346be687344d12a72074ad68853a (patch) | |
tree | 1aaef30395f566c2e098af13c20395fdb776697e /target/linux/mcs814x | |
parent | 2738cfcfdad8aa2ca3e7ef4bb50bc36c978a768e (diff) | |
download | upstream-10a71220f241346be687344d12a72074ad68853a.tar.gz upstream-10a71220f241346be687344d12a72074ad68853a.tar.bz2 upstream-10a71220f241346be687344d12a72074ad68853a.zip |
kernel: CONFIG_BRIDGE should not be overridden
this breaks ebtables, netfilter, ... during fullbuilds
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 45276
Diffstat (limited to 'target/linux/mcs814x')
-rw-r--r-- | target/linux/mcs814x/config-3.14 | 1 | ||||
-rw-r--r-- | target/linux/mcs814x/config-3.18 | 1 |
2 files changed, 0 insertions, 2 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 |