diff --git a/src/devices/Makefile.inc b/src/devices/Makefile.inc
index 86b4d21e07..9ffc0bb921 100644
--- a/src/devices/Makefile.inc
+++ b/src/devices/Makefile.inc
@@ -3,10 +3,10 @@ ramstage-y += root_device.c
 ramstage-y += device_util.c
 ramstage-y += pci_device.c
 ramstage-$(CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT) += hypertransport.c
-ramstage-y += pcix_device.c
+ramstage-$(CONFIG_PCIX_PLUGIN_SUPPORT) += pcix_device.c
 ramstage-y += pciexp_device.c
-ramstage-y += agp_device.c
-ramstage-y += cardbus_device.c
+ramstage-$(CONFIG_AGP_PLUGIN_SUPPORT) += agp_device.c
+ramstage-$(CONFIG_CARDBUS_PLUGIN_SUPPORT) += cardbus_device.c
 ramstage-y += pnp_device.c
 ramstage-y += pci_ops.c
 ramstage-y += smbus_ops.c