summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
diff options
context:
space:
mode:
authorDenis Carikli <denis@eukrea.com>2014-01-10 16:40:39 +0100
committerShawn Guo <shawn.guo@linaro.org>2014-03-05 10:35:04 +0800
commitc51bcd158d96ede3aaa8a4206dcc1e4bd9f4e9ae (patch)
tree19e2de2aa99faa87e82f27455d649964f67c1427 /arch/arm/mach-imx
parent94645973abde139549542c443a07c5844ac3ce9e (diff)
downloadlinux-stable-c51bcd158d96ede3aaa8a4206dcc1e4bd9f4e9ae.tar.gz
linux-stable-c51bcd158d96ede3aaa8a4206dcc1e4bd9f4e9ae.tar.bz2
linux-stable-c51bcd158d96ede3aaa8a4206dcc1e4bd9f4e9ae.zip
ARM i.MX35: build in pinctrl support.
shawn.guo: While at it, we drop 'select PINCTRL' from SOC_IMX35, since it's been covered by ARCH_MXC. Cc: Rob Herring <rob.herring@calxeda.com> Cc: Pawel Moll <pawel.moll@arm.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Stephen Warren <swarren@wwwdotorg.org> Cc: Ian Campbell <ijc+devicetree@hellion.org.uk> Cc: devicetree@vger.kernel.org Cc: Sascha Hauer <kernel@pengutronix.de> Cc: Fabio Estevam <fabio.estevam@freescale.com> Cc: linux-arm-kernel@lists.infradead.org Cc: Russell King <linux@arm.linux.org.uk> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Eric BĂ©nard <eric@eukrea.com> Signed-off-by: Denis Carikli <denis@eukrea.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r--arch/arm/mach-imx/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 41ffd433f709..a2f48487e90b 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -116,8 +116,8 @@ config SOC_IMX35
select ARCH_MXC_IOMUX_V3
select HAVE_EPIT
select MXC_AVIC
+ select PINCTRL_IMX35
select SMP_ON_UP if SMP
- select PINCTRL
config SOC_IMX5
bool