Skip to content

Commit feaa334

Browse files
hcahcaAlexander Gordeev
authored andcommitted
s390: Update defconfigs
Acked-by: Alexander Gordeev <[email protected]> Signed-off-by: Heiko Carstens <[email protected]> Signed-off-by: Alexander Gordeev <[email protected]>
1 parent cea5589 commit feaa334

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

arch/s390/configs/debug_defconfig

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -601,17 +601,16 @@ CONFIG_WATCHDOG=y
601601
CONFIG_WATCHDOG_NOWAYOUT=y
602602
CONFIG_SOFT_WATCHDOG=m
603603
CONFIG_DIAG288_WATCHDOG=m
604+
CONFIG_DRM=m
605+
CONFIG_DRM_VIRTIO_GPU=m
604606
CONFIG_FB=y
605607
# CONFIG_FB_DEVICE is not set
606-
CONFIG_FRAMEBUFFER_CONSOLE=y
607-
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
608608
# CONFIG_HID_SUPPORT is not set
609609
# CONFIG_USB_SUPPORT is not set
610610
CONFIG_INFINIBAND=m
611611
CONFIG_INFINIBAND_USER_ACCESS=m
612612
CONFIG_MLX4_INFINIBAND=m
613613
CONFIG_MLX5_INFINIBAND=m
614-
CONFIG_SYNC_FILE=y
615614
CONFIG_VFIO=m
616615
CONFIG_VFIO_PCI=m
617616
CONFIG_MLX5_VFIO_PCI=m

arch/s390/configs/defconfig

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -592,17 +592,16 @@ CONFIG_WATCHDOG_CORE=y
592592
CONFIG_WATCHDOG_NOWAYOUT=y
593593
CONFIG_SOFT_WATCHDOG=m
594594
CONFIG_DIAG288_WATCHDOG=m
595+
CONFIG_DRM=m
596+
CONFIG_DRM_VIRTIO_GPU=m
595597
CONFIG_FB=y
596598
# CONFIG_FB_DEVICE is not set
597-
CONFIG_FRAMEBUFFER_CONSOLE=y
598-
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
599599
# CONFIG_HID_SUPPORT is not set
600600
# CONFIG_USB_SUPPORT is not set
601601
CONFIG_INFINIBAND=m
602602
CONFIG_INFINIBAND_USER_ACCESS=m
603603
CONFIG_MLX4_INFINIBAND=m
604604
CONFIG_MLX5_INFINIBAND=m
605-
CONFIG_SYNC_FILE=y
606605
CONFIG_VFIO=m
607606
CONFIG_VFIO_PCI=m
608607
CONFIG_MLX5_VFIO_PCI=m

0 commit comments

Comments
 (0)