projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 's390-5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
[linux-2.6-microblaze.git]
/
arch
/
s390
/
configs
/
defconfig
diff --git
a/arch/s390/configs/defconfig
b/arch/s390/configs/defconfig
index
03b04ba
..
e1642d2
100644
(file)
--- a/
arch/s390/configs/defconfig
+++ b/
arch/s390/configs/defconfig
@@
-324,7
+324,7
@@
CONFIG_L2TP_DEBUGFS=m
CONFIG_L2TP_V3=y
CONFIG_L2TP_IP=m
CONFIG_L2TP_ETH=m
-CONFIG_BRIDGE=
m
+CONFIG_BRIDGE=
y
CONFIG_BRIDGE_MRP=y
CONFIG_VLAN_8021Q=m
CONFIG_VLAN_8021Q_GVRP=y