diff --git a/drivers/misc/mods/Makefile b/drivers/misc/mods/Makefile
index a1e2eb16..f5ee8bd3 100644
--- a/drivers/misc/mods/Makefile
+++ b/drivers/misc/mods/Makefile
@@ -8,6 +8,19 @@ endif
 ccflags-y += -I$(srctree.nvidia)/include
 ccflags-y += -DMODS_HAS_TEGRA
 
+ifeq ($(CONFIG_ARM_FFA_TRANSPORT),m)
+    ifdef ALLOW_ARM_FFA_TRANSPORT_AS_MODULE
+        HAVE_ARM_FFA = $(CONFIG_ARM_FFA_TRANSPORT)
+        ccflags-y += -DMODS_HAS_ARM_FFA
+    endif
+else
+    ifeq ($(CONFIG_ARM_FFA_TRANSPORT),y)
+        HAVE_ARM_FFA = $(CONFIG_ARM_FFA_TRANSPORT)
+        ccflags-y += -DMODS_HAS_ARM_FFA
+    endif
+endif
+HAVE_ARM_FFA ?=
+
 obj-m += mods.o
 
 mods-y                             := mods_irq.o
@@ -16,7 +29,7 @@ mods-y                             += mods_mem.o
 
 mods-$(CONFIG_ACPI)                += mods_acpi.o
 mods-$(CONFIG_TEGRA_NVADSP)        += mods_adsp.o
-mods-$(CONFIG_ARM_FFA_TRANSPORT)   += mods_arm_ffa.o
+mods-$(HAVE_ARM_FFA)               += mods_arm_ffa.o
 mods-$(CONFIG_TEGRA_IVC)           += mods_bpmpipc.o
 mods-$(CONFIG_COMMON_CLK)          += mods_clock.o
 mods-$(CONFIG_DEBUG_FS)            += mods_debugfs.o
diff --git a/drivers/misc/mods/mods_config.h b/drivers/misc/mods/mods_config.h
index c43562b7..af5b7d91 100644
--- a/drivers/misc/mods/mods_config.h
+++ b/drivers/misc/mods/mods_config.h
@@ -108,10 +108,4 @@
 #   define IS_MODULE(c) 0
 #endif
 
-#if ((defined(CONFIG_ARM_FFA_TRANSPORT) || IS_MODULE(CONFIG_ARM_FFA_TRANSPORT)) && \
-	 defined(ALLOW_ARM_FFA_TRANSPORT_AS_MODULE)) || \
-	 IS_BUILTIN(CONFIG_ARM_FFA_TRANSPORT)
-#       define MODS_HAS_ARM_FFA
-#endif
-
 #endif /* _MODS_CONFIG_H_  */