diff --git a/debian/changelog b/debian/changelog
index c66a5702f..b54ed2541 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ linux (4.18~rc8-1~exp1) UNRELEASED; urgency=medium
   [ Romain Perier ]
   * [armhf, arm64] add the rt featureset, which adds support for
     PREEMPT_RT (Closes #719547)
+  * spi: Enable CONFIG_SPI_SPIDEV (Closes: #904043)
 
   [ Ben Hutchings ]
   * certs: Remove certificates for test key used in Debian signing service and
diff --git a/debian/config/armhf/config b/debian/config/armhf/config
index 79ee427b5..996f9fc8e 100644
--- a/debian/config/armhf/config
+++ b/debian/config/armhf/config
@@ -1094,7 +1094,6 @@ CONFIG_SPI_SUN4I=m
 CONFIG_SPI_SUN6I=m
 CONFIG_SPI_TEGRA114=m
 CONFIG_SPI_TEGRA20_SFLASH=m
-CONFIG_SPI_SPIDEV=y
 
 ##
 ## file: drivers/thermal/Kconfig
diff --git a/debian/config/config b/debian/config/config
index e21b53aea..ea8cb5224 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -4416,6 +4416,7 @@ CONFIG_SCSI_UFSHCD_PCI=m
 ## file: drivers/spi/Kconfig
 ##
 CONFIG_SPI=y
+CONFIG_SPI_SPIDEV=y
 # CONFIG_SPI_DEBUG is not set
 # CONFIG_SPI_ALTERA is not set
 # CONFIG_SPI_AXI_SPI_ENGINE is not set
@@ -4435,7 +4436,6 @@ CONFIG_SPI_LM70_LLP=m
 # CONFIG_SPI_XCOMM is not set
 # CONFIG_SPI_XILINX is not set
 # CONFIG_SPI_ZYNQMP_GQSPI is not set
-# CONFIG_SPI_SPIDEV is not set
 # CONFIG_SPI_LOOPBACK_TEST is not set
 # CONFIG_SPI_TLE62X0 is not set