diff --git a/config-generic b/config-generic
index c2f589b..8b1cc12 100644
--- a/config-generic
+++ b/config-generic
@@ -4727,7 +4727,7 @@ CONFIG_OPTIMIZE_INLINING=y
 # FIXME: This should be x86/ia64 only
 # CONFIG_HP_ILO is not set
 
-# CONFIG_GPIOLIB is not set
+CONFIG_GPIOLIB=y
 # CONFIG_PINCTRL is not set
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_PINMUX is not set
diff --git a/kernel.spec b/kernel.spec
index 9517e46..dc8e39c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2283,6 +2283,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Wed Jan 08 2014 Josh Boyer <jwboyer@fedoraproject.org>
+- Enable BCMA_DRIVER_GPIO by turning on GPIOLIB everywhere (rhbz 1021098)
+
 * Mon Jan 06 2014 Josh Boyer <jwboyer@fedoraproject.org>
 - Add support for BCM57786 devices to tg3 (rhbz 1044471)
 - Fix use after free crash in KVM (rhbz 1047892)