diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-04-20 07:40:19 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-04-20 07:40:19 +0200 |
| commit | cf8fb9f608def942d2d75c6180bf886b197fa666 (patch) | |
| tree | d614e499629dc78186b458093af9edacdaae0e6c /kernel-s390x.config | |
| parent | f7439742fcc7d1d1c529fd21ce1316bf03ec079b (diff) | |
| parent | 61efc9cd0790f36b94d91c272b1f2c5562141faf (diff) | |
| download | kernel-cf8fb9f608def942d2d75c6180bf886b197fa666.tar.gz kernel-cf8fb9f608def942d2d75c6180bf886b197fa666.tar.xz kernel-cf8fb9f608def942d2d75c6180bf886b197fa666.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.17.0-0.rc1.git2.1.vanilla.knurd.1.fc28kernel-4.17.0-0.rc1.git2.1.vanilla.knurd.1.fc27
Diffstat (limited to 'kernel-s390x.config')
| -rw-r--r-- | kernel-s390x.config | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config index 7b03cb78e..ae4361772 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -305,10 +305,10 @@ CONFIG_B53_SRAB_DRIVER=m # CONFIG_BACKLIGHT_ADP8870 is not set CONFIG_BACKLIGHT_ARCXCNN=m # CONFIG_BACKLIGHT_BD6107 is not set -# CONFIG_BACKLIGHT_CLASS_DEVICE is not set +CONFIG_BACKLIGHT_CLASS_DEVICE=m # CONFIG_BACKLIGHT_GENERIC is not set # CONFIG_BACKLIGHT_GPIO is not set -# CONFIG_BACKLIGHT_LCD_SUPPORT is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y # CONFIG_BACKLIGHT_LM3630A is not set # CONFIG_BACKLIGHT_LM3630 is not set # CONFIG_BACKLIGHT_LM3639 is not set @@ -1089,7 +1089,6 @@ CONFIG_DRM_NOUVEAU=m # CONFIG_DRM_NXP_PTN3460 is not set # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set -# CONFIG_DRM_PANEL is not set # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set # CONFIG_DRM_PANEL_LG_LG4573 is not set # CONFIG_DRM_PANEL_LVDS is not set @@ -1106,6 +1105,7 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m # CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set # CONFIG_DRM_PANEL_SIMPLE is not set # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set +CONFIG_DRM_PANEL=y # CONFIG_DRM_PARADE_PS8622 is not set CONFIG_DRM_QXL=m # CONFIG_DRM_R128 is not set @@ -1334,8 +1334,8 @@ CONFIG_FB_EFI=y # CONFIG_FB_I740 is not set # CONFIG_FB_IBM_GXT4500 is not set # CONFIG_FB_IMSTT is not set -# CONFIG_FB is not set # CONFIG_FB_KYRO is not set +CONFIG_FB=m # CONFIG_FB_MATROX_G is not set # CONFIG_FB_MATROX_I2C is not set # CONFIG_FB_MATROX is not set @@ -1719,7 +1719,7 @@ CONFIG_HVC_IUCV=y CONFIG_HW_CONSOLE=y CONFIG_HWLAT_TRACER=y # CONFIG_HWMON_DEBUG_CHIP is not set -# CONFIG_HWMON is not set +CONFIG_HWMON=m CONFIG_HWPOISON_INJECT=m CONFIG_HW_RANDOM_S390=m CONFIG_HW_RANDOM_TIMERIOMEM=m @@ -1732,7 +1732,7 @@ CONFIG_HYSDN_CAPI=y CONFIG_HYSDN=m # CONFIG_HZ_1000 is not set CONFIG_HZ_100=y -# CONFIG_I2C_ALGOBIT is not set +CONFIG_I2C_ALGOBIT=m # CONFIG_I2C_ALGOPCA is not set # CONFIG_I2C_ALGOPCF is not set # CONFIG_I2C_ALI1535 is not set @@ -2682,7 +2682,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_AXP20X is not set # CONFIG_MFD_BCM590XX is not set # CONFIG_MFD_BD9571MWV is not set -# CONFIG_MFD_CORE is not set +CONFIG_MFD_CORE=m # CONFIG_MFD_CPCAP is not set # CONFIG_MFD_CROS_EC is not set # CONFIG_MFD_CS5535 is not set @@ -4248,9 +4248,8 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 CONFIG_SCSI_SYM53C8XX_MMIO=y # CONFIG_SCSI_UFS_DWC_TC_PCI is not set +# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set # CONFIG_SCSI_UFSHCD is not set -CONFIG_SCSI_UFSHCD_PCI=m -# CONFIG_SCSI_UFSHCD_PLATFORM is not set CONFIG_SCSI_VIRTIO=m # CONFIG_SCSI_WD719X is not set CONFIG_SCSI=y @@ -4955,7 +4954,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m CONFIG_SWAP=y # CONFIG_SW_SYNC is not set # CONFIG_SX9500 is not set -# CONFIG_SYNC_FILE is not set +CONFIG_SYNC_FILE=y # CONFIG_SYNCLINK_CS is not set CONFIG_SYNCLINK_GT=m CONFIG_SYNCLINK=m |