summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-02-08 05:00:44 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-08 05:00:44 +0400
commit95436adaa0f97e42e89978690c3a79cf9ef0d486 (patch)
treec50177a65861f82d00a624640acf6d39875ea6da /arch
parenta04521ab8071a46dff5d618c98b37427a8aab9f4 (diff)
parent228f1ce9b8e9e63c3ffc1b03b64d77277cacb89f (diff)
downloadlinux-95436adaa0f97e42e89978690c3a79cf9ef0d486.tar.xz
Merge tag 'pinctrl-for-v3.8-late' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Pull late pinctrl fixes from Linus Walleij: "Two patches appeared as of late, one was completely news to me, the other one was rotated in -next for the next merge window but turned out to be a showstopper. - Exynos Kconfig fixup - SIRF DT translation bug" * tag 'pinctrl-for-v3.8-late' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: pinctrl: sirf: replace of_gpio_simple_xlate by sirf specific of_xlate pinctrl: exynos: change PINCTRL_EXYNOS option
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-exynos/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index e103c290bc9e..85afb031b676 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -414,7 +414,7 @@ config MACH_EXYNOS4_DT
select CPU_EXYNOS4210
select HAVE_SAMSUNG_KEYPAD if INPUT_KEYBOARD
select PINCTRL
- select PINCTRL_EXYNOS4
+ select PINCTRL_EXYNOS
select USE_OF
help
Machine support for Samsung Exynos4 machine with device tree enabled.