diff --git a/Makefile b/Makefile
index f70c47ab..4f91097c 100644
--- a/Makefile
+++ b/Makefile
@@ -47,9 +47,15 @@ endif
 # The module order matters; it determines the module order for
 # both the insmod and rmmod targets. The module order is also
 # leveraged for install packages by the dkms.conf file.
+ifneq ($(CONFIG_FPGA),y)
 obj-m += fpga-mgr.o
+endif
+ifneq ($(CONFIG_FPGA_BRIDGE),y)
 obj-m += fpga-bridge.o
+endif
+ifneq ($(CONFIG_FPGA_REGION),y)
 obj-m += fpga-region.o
+endif
 ifndef CONFIG_FW_UPLOAD
 obj-m += fpga-image-load.o
 endif