diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-04-20 15:47:34 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-04-20 15:47:34 +0200 |
| commit | e7f67bfda8b9f7d72ccb37086a7686f625f7db9c (patch) | |
| tree | 210ae97882f5edadb3b71ea3473ea3cb4a0455cb /kernel-s390x-zfcpdump-rhel.config | |
| parent | 95325f68cbc232e30137829afdbe69770f410ec2 (diff) | |
| parent | b4aa7140f3d9ab3f0910055d3f8f805ae1326906 (diff) | |
| download | kernel-e7f67bfda8b9f7d72ccb37086a7686f625f7db9c.tar.gz kernel-e7f67bfda8b9f7d72ccb37086a7686f625f7db9c.tar.xz kernel-e7f67bfda8b9f7d72ccb37086a7686f625f7db9c.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.18.0-0.rc3.20220420git559089e0a93d442.29.vanilla.1.fc36
Diffstat (limited to 'kernel-s390x-zfcpdump-rhel.config')
| -rw-r--r-- | kernel-s390x-zfcpdump-rhel.config | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 360d72035..04469bf57 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -2822,16 +2822,16 @@ CONFIG_MD_RAID10=m CONFIG_MD_RAID1=m CONFIG_MD_RAID456=m CONFIG_MEDIA_ALTERA_CI=m -CONFIG_MEDIA_ANALOG_TV_SUPPORT=y +# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set CONFIG_MEDIA_ATTACH=y CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_CEC_RC=y CONFIG_MEDIA_CEC_SUPPORT=y # CONFIG_MEDIA_CONTROLLER is not set -CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y +# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set CONFIG_MEDIA_PCI_SUPPORT=y # CONFIG_MEDIA_PLATFORM_SUPPORT is not set -CONFIG_MEDIA_RADIO_SUPPORT=y +# CONFIG_MEDIA_RADIO_SUPPORT is not set # CONFIG_MEDIA_SDR_SUPPORT is not set CONFIG_MEDIA_SUBDRV_AUTOSELECT=y CONFIG_MEDIA_SUPPORT_FILTER=y @@ -3020,7 +3020,7 @@ CONFIG_MLX5_TC_CT=y CONFIG_MLX5_TC_SAMPLE=y CONFIG_MLX5_TLS=y CONFIG_MLX5_VDPA_NET=m -# CONFIG_MLX5_VFIO_PCI is not set +CONFIG_MLX5_VFIO_PCI=m # CONFIG_MLX90614 is not set # CONFIG_MLX90632 is not set # CONFIG_MLXBF_BOOTCTL is not set @@ -4492,7 +4492,6 @@ CONFIG_SATA_AHCI=m CONFIG_SATA_AHCI_PLATFORM=m # CONFIG_SATA_DWC is not set # CONFIG_SATA_INIC162X is not set -CONFIG_SATA_LPM_POLICY=0 CONFIG_SATA_MOBILE_LPM_POLICY=0 # CONFIG_SATA_MV is not set # CONFIG_SATA_NV is not set @@ -6409,7 +6408,7 @@ CONFIG_VIDEO_DEV=m # CONFIG_VIDEO_DW9807_VCM is not set CONFIG_VIDEO_EM28XX_ALSA=m CONFIG_VIDEO_EM28XX_DVB=m -CONFIG_VIDEO_EM28XX=m +# CONFIG_VIDEO_EM28XX is not set CONFIG_VIDEO_EM28XX_RC=m # CONFIG_VIDEO_EM28XX_V4L2 is not set # CONFIG_VIDEO_ET8EK8 is not set |