diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-12 19:32:38 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-12 19:32:38 +0200 |
| commit | f7ab3f33fe442b453cab73ec62b87ea9a757e0c7 (patch) | |
| tree | ba1b47ae2358f68977e463a497247f11c432bba8 /kernel-s390x-debug-fedora.config | |
| parent | 17af4ec052a4e628ec6142e19398fdfabb4206e8 (diff) | |
| parent | c0b2feb7cc95ed98798dd3d2aafa0679e81e7918 (diff) | |
| download | kernel-f7ab3f33fe442b453cab73ec62b87ea9a757e0c7.tar.gz kernel-f7ab3f33fe442b453cab73ec62b87ea9a757e0c7.tar.xz kernel-f7ab3f33fe442b453cab73ec62b87ea9a757e0c7.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200612gitb791d1bdf921.1.vanilla.1.fc33kernel-5.8.0-0.rc0.20200612gitb791d1bdf921.1.vanilla.1.fc32kernel-5.8.0-0.rc0.20200612gitb791d1bdf921.1.vanilla.1.fc31
Diffstat (limited to 'kernel-s390x-debug-fedora.config')
| -rw-r--r-- | kernel-s390x-debug-fedora.config | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index c3a6cd289..854083ff4 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -1145,7 +1145,9 @@ CONFIG_DLM=m CONFIG_DM9102=m # CONFIG_DMA_API_DEBUG_SG is not set CONFIG_DMA_API_DEBUG=y -# CONFIG_DMABUF_HEAPS is not set +CONFIG_DMABUF_HEAPS_CMA=y +CONFIG_DMABUF_HEAPS_SYSTEM=y +CONFIG_DMABUF_HEAPS=y # CONFIG_DMABUF_MOVE_NOTIFY is not set # CONFIG_DMABUF_SELFTESTS is not set # CONFIG_DMA_CMA is not set @@ -4241,6 +4243,7 @@ CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set +# CONFIG_QCOM_IPCC is not set # CONFIG_QCOM_OCMEM is not set # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set # CONFIG_QCS_TURING_404 is not set |