diff --git a/debian/changelog b/debian/changelog
index 3ddda6554..80a9076e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -390,6 +390,8 @@ linux (4.9.25-1) UNRELEASED; urgency=medium
   * [arm64] Enable ARMV8_DEPRECATED, SWP_EMULATION, CP15_BARRIER_EMULATION,
     SETEND_EMULATION (Closes: #861384)
   * udeb: Add tifm_7xx1 to mmc-modules (Closes: #861195)
+  * leds: Enable LEDS_GPIO as module for all configurations with GPIOs
+    (Closes: #860569)
 
   [ Salvatore Bonaccorso ]
   * ping: implement proper locking (CVE-2017-2671)
diff --git a/debian/config/arm64/config b/debian/config/arm64/config
index 46dc9e581..c23a7edad 100644
--- a/debian/config/arm64/config
+++ b/debian/config/arm64/config
@@ -286,11 +286,6 @@ CONFIG_TEGRA_IOMMU_SMMU=y
 CONFIG_ARM_SMMU=y
 CONFIG_ARM_SMMU_V3=y
 
-##
-## file: drivers/leds/Kconfig
-##
-CONFIG_LEDS_GPIO=m
-
 ##
 ## file: drivers/mailbox/Kconfig
 ##
diff --git a/debian/config/armel/config.marvell b/debian/config/armel/config.marvell
index 2d108a604..bd0381c84 100644
--- a/debian/config/armel/config.marvell
+++ b/debian/config/armel/config.marvell
@@ -307,7 +307,6 @@ CONFIG_ISDN_DIVAS_MAINT=m
 ##
 ## file: drivers/leds/Kconfig
 ##
-CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_NS2=m
 CONFIG_LEDS_NETXBIG=m
 
diff --git a/debian/config/armhf/config b/debian/config/armhf/config
index aad3d12f0..2fd332c97 100644
--- a/debian/config/armhf/config
+++ b/debian/config/armhf/config
@@ -491,7 +491,6 @@ CONFIG_TEGRA_IOMMU_SMMU=y
 ## file: drivers/leds/Kconfig
 ##
 CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=m
 CONFIG_LEDS_LP5523=m
 CONFIG_LEDS_DA9052=m
 CONFIG_LEDS_PWM=m
diff --git a/debian/config/config b/debian/config/config
index fdc0cb529..e65fe0ff2 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -1676,7 +1676,7 @@ CONFIG_LEDS_CLASS=y
 # CONFIG_LEDS_LM3642 is not set
 CONFIG_LEDS_NET48XX=m
 # CONFIG_LEDS_PCA9532 is not set
-# CONFIG_LEDS_GPIO is not set
+CONFIG_LEDS_GPIO=m
 CONFIG_LEDS_LP3944=m
 # CONFIG_LEDS_LP3952 is not set
 # CONFIG_LEDS_LP5521 is not set
diff --git a/debian/config/i386/config.686 b/debian/config/i386/config.686
index d3a811da5..f07efc7df 100644
--- a/debian/config/i386/config.686
+++ b/debian/config/i386/config.686
@@ -41,11 +41,6 @@ CONFIG_KEYBOARD_GPIO_POLLED=m
 ##
 CONFIG_MOUSE_PS2_OLPC=y
 
-##
-## file: drivers/leds/Kconfig
-##
-CONFIG_LEDS_GPIO=m
-
 ##
 ## file: drivers/net/hamradio/Kconfig
 ##