diff --git a/config-armv7-generic b/config-armv7-generic
index 99c81a7f2..663f86b82 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -178,7 +178,7 @@ CONFIG_MFD_TPS65912_SPI=y
 CONFIG_PINMUX=y
 CONFIG_PINCONF=y
 CONFIG_PINCTRL=y
-CONFIG_PINCTRL_SINGLE=m
+CONFIG_PINCTRL_SINGLE=y
 # CONFIG_PINCTRL_SAMSUNG is not set
 # CONFIG_PINCTRL_EXYNOS4 is not set
 
diff --git a/kernel.spec b/kernel.spec
index 141607d16..95a8fbf1c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2239,6 +2239,10 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Tue Aug 27 2013 Kyle McMartin <kyle@redhat.com>
+- [arm] build pinctrl-single in, needed to prevent deferral of
+  omap_serial registration.
+
 * Mon Aug 26 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.11.0-0.rc7.git0.1
 - Linux v3.11-rc7
 - Disable debugging options.