summaryrefslogtreecommitdiff
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-11-11 19:12:33 +0100
committerLinus Walleij <linus.walleij@linaro.org>2012-11-11 19:12:33 +0100
commite59d969f441fb8e25b30125bdf201153adc5a7e3 (patch)
treee18250fbc1bc9e2ca864292d2390325f8ac84c80 /arch/arm/Kconfig
parent4ddb1c295752252f61670e35c791bf16e58bbce6 (diff)
parentf6f94f6660dbe34039e5c86a46c7845589e7ee0c (diff)
downloadlinux-3.10-e59d969f441fb8e25b30125bdf201153adc5a7e3.tar.gz
linux-3.10-e59d969f441fb8e25b30125bdf201153adc5a7e3.tar.bz2
linux-3.10-e59d969f441fb8e25b30125bdf201153adc5a7e3.zip
Merge branch 'at91' into devel
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ade7e924bef..a18cfefbee4 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -330,6 +330,8 @@ config ARCH_AT91
select IRQ_DOMAIN
select NEED_MACH_GPIO_H
select NEED_MACH_IO_H if PCCARD
+ select PINCTRL
+ select PINCTRL_AT91 if USE_OF
help
This enables support for systems based on Atmel
AT91RM9200 and AT91SAM9* processors.