summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-05-15 13:24:34 +0200
committerArnd Bergmann <arnd@arndb.de>2012-05-15 14:42:57 +0200
commit0fa7be407dc101afe2d3dc99ded99de34c967a52 (patch)
tree457d3a7938b073d31b1e2c23ec75abfda0b4eaac /drivers/pinctrl
parentMerge tag 'ux500-gpio-pins-for-3.5' of git://git.kernel.org/pub/scm/linux/ker... (diff)
downloadlinux-0fa7be407dc101afe2d3dc99ded99de34c967a52.tar.xz
linux-0fa7be407dc101afe2d3dc99ded99de34c967a52.zip
ARM: nomadik: enable PINCTRL_NOMADIK where needed
The nomadik gpio code has been converted to pinctrl, but the nomadik platform still expects the old code to be present. Change it to use the new one instead. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r--drivers/pinctrl/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index cc01c758bbfc..ce2e756b19ad 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -66,7 +66,7 @@ config PINCTRL_IMX28
config PINCTRL_NOMADIK
bool "Nomadik pin controller driver"
- depends on ARCH_U8500
+ depends on ARCH_U8500 || ARCH_NOMADIK
select PINMUX
select PINCONF