diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-06-28 21:17:58 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-06-28 21:17:58 +0200 |
| commit | acb22e094e5793bb2a8e6a939ddc086fcc5f647e (patch) | |
| tree | 754a1059062078ba4fb527c452de4a88e9f16b3d /kernel-s390x-debug-fedora.config | |
| parent | a79c993bd6413666d3fe3c524bba80b771a82d38 (diff) | |
| parent | 5d333e15578f0c55d6293c7a2897fc14287888be (diff) | |
| download | kernel-acb22e094e5793bb2a8e6a939ddc086fcc5f647e.tar.gz kernel-acb22e094e5793bb2a8e6a939ddc086fcc5f647e.tar.xz kernel-acb22e094e5793bb2a8e6a939ddc086fcc5f647e.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.19.0-0.rc4.20220628git941e3e791269.34.vanilla.1.fc36
Diffstat (limited to 'kernel-s390x-debug-fedora.config')
| -rw-r--r-- | kernel-s390x-debug-fedora.config | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index a020d7ab3..d8f3dfa39 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -1485,7 +1485,7 @@ CONFIG_DRM_SSD130X_I2C=m CONFIG_DRM_SSD130X=m CONFIG_DRM_SSD130X_SPI=m # CONFIG_DRM_THINE_THC63LVD1024 is not set -CONFIG_DRM_TIDSS=m +# CONFIG_DRM_TIDSS is not set # CONFIG_DRM_TI_SN65DSI83 is not set CONFIG_DRM_TI_SN65DSI86=m CONFIG_DRM_TI_TFP410=m @@ -3998,7 +3998,7 @@ CONFIG_NET_VENDOR_PENSANDO=y # CONFIG_NET_VENDOR_SUN is not set # CONFIG_NET_VENDOR_SYNOPSYS is not set # CONFIG_NET_VENDOR_TEHUTI is not set -# CONFIG_NET_VENDOR_TI is not set +CONFIG_NET_VENDOR_TI=y CONFIG_NET_VENDOR_VERTEXCOM=y # CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_WIZNET is not set @@ -4273,7 +4273,7 @@ CONFIG_OCFS2_FS=m CONFIG_OCFS2_FS_O2CB=m # CONFIG_OCFS2_FS_STATS is not set CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m -# CONFIG_OCTEON_EP is not set +CONFIG_OCTEON_EP=m CONFIG_OF_FPGA_REGION=m # CONFIG_OF is not set # CONFIG_OMFS_FS is not set @@ -6556,7 +6556,6 @@ CONFIG_TIPC_DIAG=m CONFIG_TIPC=m # CONFIG_TIPC_MEDIA_IB is not set CONFIG_TIPC_MEDIA_UDP=y -CONFIG_TI_SCI_PROTOCOL=m # CONFIG_TI_ST is not set # CONFIG_TI_TLC4541 is not set CONFIG_TI_TSC2046=m @@ -7277,7 +7276,6 @@ CONFIG_VIDEO_STK1160_COMMON=m CONFIG_VIDEO_STK1160=m CONFIG_VIDEO_STM32_DMA2D=m # CONFIG_VIDEO_TEGRA_TPG is not set -CONFIG_VIDEO_TI_CAL_MC=y CONFIG_VIDEO_TM6000_ALSA=m CONFIG_VIDEO_TM6000_DVB=m CONFIG_VIDEO_TM6000=m @@ -7299,6 +7297,7 @@ CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_FS=m +# CONFIG_VIRTIO_HARDEN_NOTIFICATION is not set CONFIG_VIRTIO_INPUT=m # CONFIG_VIRTIO_IOMMU is not set CONFIG_VIRTIO_MEM=m |