diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-12-13 18:25:13 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-12-13 18:25:13 +0100 |
| commit | 527c790fb66c203af321e8d6bae2882a69a35def (patch) | |
| tree | e2a7581228314332935d6212948bc4dfa34b1642 /kernel-aarch64-fedora.config | |
| parent | 4a9f3c0b3c198d4eca0d4a1f8bc13f2be4968f15 (diff) | |
| parent | 33509b1f24d13aff9855b4b775ceff6dae41acfb (diff) | |
| download | kernel-527c790fb66c203af321e8d6bae2882a69a35def.tar.gz kernel-527c790fb66c203af321e8d6bae2882a69a35def.tar.xz kernel-527c790fb66c203af321e8d6bae2882a69a35def.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.16.0-0.rc5.35.vanilla.1.fc36kernel-5.16.0-0.rc5.35.vanilla.1.fc35kernel-5.16.0-0.rc5.35.vanilla.1.fc34
Diffstat (limited to 'kernel-aarch64-fedora.config')
| -rw-r--r-- | kernel-aarch64-fedora.config | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index fe76e9629..f79b311cc 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -2810,6 +2810,7 @@ CONFIG_IMX2_WDT=m CONFIG_IMX7D_ADC=m # CONFIG_IMX7ULP_WDT is not set CONFIG_IMX8MM_THERMAL=m +# CONFIG_IMX8QXP_ADC is not set # CONFIG_IMX_DMA is not set CONFIG_IMX_DSP=m CONFIG_IMX_DSP_REMOTEPROC=m @@ -8112,7 +8113,7 @@ CONFIG_VFIO_FSL_MC=m CONFIG_VFIO_IOMMU_TYPE1=m CONFIG_VFIO=m CONFIG_VFIO_MDEV=m -# CONFIG_VFIO_NOIOMMU is not set +CONFIG_VFIO_NOIOMMU=y CONFIG_VFIO_PCI=m CONFIG_VFIO_PLATFORM_AMDXGBE_RESET=m # CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET is not set |