summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2013-02-08 17:42:18 -0500
committerJosh Boyer <jwboyer@redhat.com>2013-02-08 17:42:18 -0500
commit39fbcbc3c63c4c5429ea87cd64bfa79aa7df354e (patch)
tree69de56d7994f43d572dd021b1b9b69311f99585f
parenta6e396049b920681bc93141d9d97246b8719fc91 (diff)
downloadkernel-39fbcbc3c63c4c5429ea87cd64bfa79aa7df354e.tar.gz
kernel-39fbcbc3c63c4c5429ea87cd64bfa79aa7df354e.tar.xz
kernel-39fbcbc3c63c4c5429ea87cd64bfa79aa7df354e.zip
Fix ARM configs
I hate it when options show up in a late -rcX. GRUMBLE.
-rw-r--r--config-arm-generic1
-rw-r--r--config-arm-kirkwood1
-rw-r--r--config-armv71
3 files changed, 3 insertions, 0 deletions
diff --git a/config-arm-generic b/config-arm-generic
index 5a3ee57dd..f1306225b 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -400,3 +400,4 @@ CONFIG_EXTCON_GPIO=m
# CONFIG_NET_VENDOR_CIRRUS is not set
# CONFIG_CS89x0 is not set
# CONFIG_DVB_USB_PCTV452E is not set
+# CONFIG_PINCTRL_EXYNOS is not set
diff --git a/config-arm-kirkwood b/config-arm-kirkwood
index ac3bf6f61..80325f723 100644
--- a/config-arm-kirkwood
+++ b/config-arm-kirkwood
@@ -60,6 +60,7 @@ CONFIG_LEDS_NETXBIG=m
CONFIG_RTC_DRV_MV=y
CONFIG_MV_XOR=y
CONFIG_CRYPTO_DEV_MV_CESA=m
+CONFIG_PINCTRL_EXYNOS=y
CONFIG_PINCTRL_MVEBU=y
CONFIG_PINCTRL_KIRKWOOD=y
diff --git a/config-armv7 b/config-armv7
index eb133980d..c3af272a1 100644
--- a/config-armv7
+++ b/config-armv7
@@ -252,6 +252,7 @@ CONFIG_INPUT_PWM_BEEPER=m
# exynos
# CONFIG_DRM_EXYNOS is not set
# CONFIG_PINCTRL_EXYNOS5440 is not set
+# CONFIG_PINCTRL_EXYNOS is not set
# picoxcell
CONFIG_CRYPTO_DEV_PICOXCELL=m