summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle McMartin <kmcmarti@redhat.com>2013-08-27 09:35:42 -0400
committerKyle McMartin <kmcmarti@redhat.com>2013-08-27 09:35:42 -0400
commit7ee0bdffc84f6434117510cb687606035cf7f279 (patch)
tree33c0059e083a261ac351f48a9d3bb58b840b582d
parent6072b10d209220e9a9319563c0c66e20372c8297 (diff)
downloadkernel-7ee0bdffc84f6434117510cb687606035cf7f279.tar.gz
kernel-7ee0bdffc84f6434117510cb687606035cf7f279.tar.xz
kernel-7ee0bdffc84f6434117510cb687606035cf7f279.zip
[arm] build pinctrl-single into the kernel
-rw-r--r--config-armv7-generic2
-rw-r--r--kernel.spec4
2 files changed, 5 insertions, 1 deletions
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.