diff --git a/arch/arm64/Kbuild b/arch/arm64/Kbuild
index ddcb496ce66c..fb93eee26ba9 100644
--- a/arch/arm64/Kbuild
+++ b/arch/arm64/Kbuild
@@ -3,7 +3,7 @@ obj-y			+= kernel/ mm/ net/
 obj-$(CONFIG_KVM)	+= kvm/
 obj-$(CONFIG_XEN)	+= xen/
 obj-$(subst m,y,$(CONFIG_HYPERV))	+= hyperv/
-obj-$(CONFIG_GUNYAH)	+= gunyah/
+obj-$(CONFIG_GUNYAH_HYPERCALLS)	+= gunyah/
 obj-$(CONFIG_CRYPTO)	+= crypto/
 obj-$(CONFIG_MTK_GZVM)	+= geniezone/
 
diff --git a/arch/arm64/gunyah/Makefile b/arch/arm64/gunyah/Makefile
index 84f1e38cafb1..0a3a39c3482e 100644
--- a/arch/arm64/gunyah/Makefile
+++ b/arch/arm64/gunyah/Makefile
@@ -1,3 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0
 
-obj-$(CONFIG_GUNYAH) += gunyah_hypercall.o
+obj-$(CONFIG_GUNYAH_HYPERCALLS) += gunyah_hypercall.o
diff --git a/drivers/virt/gunyah/Kconfig b/drivers/virt/gunyah/Kconfig
index 1a3be28d90d8..fdc546145e26 100644
--- a/drivers/virt/gunyah/Kconfig
+++ b/drivers/virt/gunyah/Kconfig
@@ -1,11 +1,15 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
+config GUNYAH_HYPERCALLS
+	tristate
+
 config GUNYAH
 	tristate "Gunyah Virtualization drivers"
 	depends on ARM64
 	select GUNYAH_PLATFORM_HOOKS
 	select AUXILIARY_BUS
 	imply GUNYAH_QCOM_PLATFORM if ARCH_QCOM
+	select GUNYAH_HYPERCALLS
 	help
 	  The Gunyah drivers are the helper interfaces that run in a guest VM
 	  such as basic inter-VM IPC and signaling mechanisms, and higher level