summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-05-15 11:24:34 +0000
committerArnd Bergmann <arnd@arndb.de>2012-05-15 14:42:57 +0200
commit0fa7be407dc101afe2d3dc99ded99de34c967a52 (patch)
tree457d3a7938b073d31b1e2c23ec75abfda0b4eaac /arch/arm/configs
parent7af07ad902cce88ebbd2ce0e681d0c541e8f95fa (diff)
downloadtalos-obmc-linux-0fa7be407dc101afe2d3dc99ded99de34c967a52.tar.gz
talos-obmc-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 'arch/arm/configs')
-rw-r--r--arch/arm/configs/nhk8815_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/nhk8815_defconfig b/arch/arm/configs/nhk8815_defconfig
index 37207d1bf44b..bf123c5384d4 100644
--- a/arch/arm/configs/nhk8815_defconfig
+++ b/arch/arm/configs/nhk8815_defconfig
@@ -97,6 +97,7 @@ CONFIG_I2C=y
CONFIG_I2C_CHARDEV=y
CONFIG_I2C_GPIO=y
CONFIG_DEBUG_GPIO=y
+CONFIG_PINCTRL_NOMADIK=y
# CONFIG_HWMON is not set
# CONFIG_VGA_CONSOLE is not set
CONFIG_RTC_CLASS=y
OpenPOWER on IntegriCloud