diff options
author | Denis Carikli <denis@eukrea.com> | 2014-01-10 10:40:39 -0500 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2014-03-04 21:35:04 -0500 |
commit | c51bcd158d96ede3aaa8a4206dcc1e4bd9f4e9ae (patch) | |
tree | 19e2de2aa99faa87e82f27455d649964f67c1427 /arch/arm/mach-imx/Kconfig | |
parent | 94645973abde139549542c443a07c5844ac3ce9e (diff) |
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/Kconfig')
-rw-r--r-- | arch/arm/mach-imx/Kconfig | 2 |
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 | |||
116 | select ARCH_MXC_IOMUX_V3 | 116 | select ARCH_MXC_IOMUX_V3 |
117 | select HAVE_EPIT | 117 | select HAVE_EPIT |
118 | select MXC_AVIC | 118 | select MXC_AVIC |
119 | select PINCTRL_IMX35 | ||
119 | select SMP_ON_UP if SMP | 120 | select SMP_ON_UP if SMP |
120 | select PINCTRL | ||
121 | 121 | ||
122 | config SOC_IMX5 | 122 | config SOC_IMX5 |
123 | bool | 123 | bool |