projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 88731c8)
s390: update defconfigs
authorHeiko Carstens <hca@linux.ibm.com>
Sat, 31 Jul 2021 11:13:40 +0000 (13:13 +0200)
committerHeiko Carstens <hca@linux.ibm.com>
Tue, 3 Aug 2021 12:31:24 +0000 (14:31 +0200)
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
arch/s390/configs/debug_defconfig patch | blob | history
arch/s390/configs/defconfig patch | blob | history

diff --git a/arch/s390/configs/debug_defconfig b/arch/s390/configs/debug_defconfig
index 7de253f766e81df6f3d3a0d10fd1c2c07bf8a6bf..b88184019af9c04b403b930b4bb6bfb10ed92324 100644 (file)
--- a/arch/s390/configs/debug_defconfig
+++ b/arch/s390/configs/debug_defconfig
@@ -335,7 +335,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
diff --git a/arch/s390/configs/defconfig b/arch/s390/configs/defconfig
index b671642967ba61b09cd89eb7347f9d662dfca8b4..1667a3cdcf0a168d0a83d2c67ef064aa802e9514 100644 (file)
--- a/arch/s390/configs/defconfig
+++ b/arch/s390/configs/defconfig
@@ -325,7 +325,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
ep93xx device tree rework repo: git://git.maquefel.me/linux.git