diff --git a/recipes-kernel/linux/linux-qcom-next/configs/qcom.cfg b/recipes-kernel/linux/linux-qcom-next/configs/qcom.cfg
index b5a294f97..5b4388783 100644
--- a/recipes-kernel/linux/linux-qcom-next/configs/qcom.cfg
+++ b/recipes-kernel/linux/linux-qcom-next/configs/qcom.cfg
@@ -1,14 +1,8 @@
 # for UFS enumeration
 CONFIG_PHY_QCOM_QMP=y
-CONFIG_SCSI_UFS_QCOM=y
 CONFIG_SM_TCSRCC_8750=y
 CONFIG_CLK_KAANAPALI_TCSRCC=y
 
-# DMA BUF userspace heaps, for e.g. IMSDK
-CONFIG_DMABUF_HEAPS=y
-CONFIG_DMABUF_HEAPS_SYSTEM=y
-CONFIG_DMABUF_HEAPS_CMA=y
-
 # Net schedulers, aka queue disciplines
 CONFIG_NET_SCH_DUALPI2=m
 CONFIG_NET_SCH_HTB=m
diff --git a/recipes-kernel/linux/linux-qcom-next_git.bb b/recipes-kernel/linux/linux-qcom-next_git.bb
index d5d2844eb..5ff0d7d9a 100644
--- a/recipes-kernel/linux/linux-qcom-next_git.bb
+++ b/recipes-kernel/linux/linux-qcom-next_git.bb
@@ -37,7 +37,8 @@ KBUILD_DEFCONFIG ?= "defconfig"
 KBUILD_DEFCONFIG:qcom-armv7a = "qcom_defconfig"
 
 KBUILD_CONFIG_EXTRA = "${@bb.utils.contains('DISTRO_FEATURES', 'hardened', '${S}/kernel/configs/hardening.config', '', d)}"
-KBUILD_CONFIG_EXTRA:append:aarch64 = "${S}/arch/arm64/configs/prune.config"
+KBUILD_CONFIG_EXTRA:append:aarch64 = " ${S}/arch/arm64/configs/prune.config"
+KBUILD_CONFIG_EXTRA:append:aarch64 = " ${S}/arch/arm64/configs/qcom.config"
 
 do_configure:prepend() {
     # Use a copy of the 'defconfig' from the actual repo to merge fragments