diff --git a/Makefile b/Makefile
index 665e96c..92f5901 100644
--- a/Makefile
+++ b/Makefile
@@ -104,7 +104,7 @@
 DEPENDS_ON_BITBANG_SPI := \
 	CONFIG_DEVELOPERBOX_SPI \
 	CONFIG_INTERNAL_X86 \
-	CONFIG_LINUX_GPIOD \
+	CONFIG_LINUX_GPIO_SPI \
 	CONFIG_NICINTEL_SPI \
 	CONFIG_OGP_SPI \
 	CONFIG_PONY_SPI \
@@ -179,7 +179,7 @@
 	CONFIG_MSTARDDC_SPI \
 
 DEPENDS_ON_LIBGPIOD := \
-	CONFIG_LINUX_GPIOD \
+	CONFIG_LINUX_GPIO_SPI \
 
 ifeq ($(CONFIG_ENABLE_LIBUSB1_PROGRAMMERS), no)
 $(call disable_all,$(DEPENDS_ON_LIBUSB1))
@@ -512,7 +512,7 @@
 # Enable Linux spidev, MTD and gpiod interfaces by default. We disable them on non-Linux targets.
 CONFIG_LINUX_MTD ?= yes
 CONFIG_LINUX_SPI ?= yes
-CONFIG_LINUX_GPIOD ?= yes
+CONFIG_LINUX_GPIO_SPI ?= yes
 
 # Always enable ITE IT8212F PATA controllers for now.
 CONFIG_IT8212 ?= yes
@@ -744,8 +744,8 @@
 PROGRAMMER_OBJS += linux_spi.o
 endif
 
-ifeq ($(CONFIG_LINUX_GPIOD), yes)
-FEATURE_FLAGS += -D'CONFIG_LINUX_GPIOD=1'
+ifeq ($(CONFIG_LINUX_GPIO_SPI), yes)
+FEATURE_FLAGS += -D'CONFIG_LINUX_GPIO_SPI=1'
 PROGRAMMER_OBJS += linux_gpio_spi.o
 endif