diff --git a/src/mainboard/lenovo/t400/Makefile.inc b/src/mainboard/lenovo/t400/Makefile.inc
index b3ca78d2de..e4e6a1f012 100644
--- a/src/mainboard/lenovo/t400/Makefile.inc
+++ b/src/mainboard/lenovo/t400/Makefile.inc
@@ -16,7 +16,7 @@
 bootblock-y += bootblock.c
 bootblock-y += dock.c
 
-subdirs-y += variants/$(VARIANT_DIR)/
+romstage-y += variants/$(VARIANT_DIR)/gpio.c
 
 ramstage-y += dock.c
 ramstage-y += cstates.c
diff --git a/src/mainboard/lenovo/t400/variants/r500/Makefile.inc b/src/mainboard/lenovo/t400/variants/r500/Makefile.inc
deleted file mode 100644
index 3dae61e8a8..0000000000
--- a/src/mainboard/lenovo/t400/variants/r500/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-romstage-y += gpio.c
diff --git a/src/mainboard/lenovo/t400/variants/t400/Makefile.inc b/src/mainboard/lenovo/t400/variants/t400/Makefile.inc
deleted file mode 100644
index 3dae61e8a8..0000000000
--- a/src/mainboard/lenovo/t400/variants/t400/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-romstage-y += gpio.c