Commit feaa3344 authored by Heiko Carstens's avatar Heiko Carstens Committed by Alexander Gordeev
Browse files

s390: Update defconfigs 



Acked-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
parent cea5589e

arch/s390/configs/debug_defconfig

+2 −3
Original line number Diff line number Diff line
@@ -601,17 +601,16 @@ CONFIG_WATCHDOG=y 
CONFIG_WATCHDOG_NOWAYOUT=y

CONFIG_SOFT_WATCHDOG=m

CONFIG_DIAG288_WATCHDOG=m

CONFIG_DRM=m

CONFIG_DRM_VIRTIO_GPU=m

CONFIG_FB=y

# CONFIG_FB_DEVICE is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_INFINIBAND=m

CONFIG_INFINIBAND_USER_ACCESS=m

CONFIG_MLX4_INFINIBAND=m

CONFIG_MLX5_INFINIBAND=m

CONFIG_SYNC_FILE=y

CONFIG_VFIO=m

CONFIG_VFIO_PCI=m

CONFIG_MLX5_VFIO_PCI=m

arch/s390/configs/defconfig

+2 −3
Original line number Diff line number Diff line
@@ -592,17 +592,16 @@ CONFIG_WATCHDOG_CORE=y 
CONFIG_WATCHDOG_NOWAYOUT=y

CONFIG_SOFT_WATCHDOG=m

CONFIG_DIAG288_WATCHDOG=m

CONFIG_DRM=m

CONFIG_DRM_VIRTIO_GPU=m

CONFIG_FB=y

# CONFIG_FB_DEVICE is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_INFINIBAND=m

CONFIG_INFINIBAND_USER_ACCESS=m

CONFIG_MLX4_INFINIBAND=m

CONFIG_MLX5_INFINIBAND=m

CONFIG_SYNC_FILE=y

CONFIG_VFIO=m

CONFIG_VFIO_PCI=m

CONFIG_MLX5_VFIO_PCI=m