From: Beniamino Galvani <b.galvani@gmail.com>
Date: Sat, 17 Jan 2015 18:15:15 +0000 (+0100)
Subject: ARM: meson: select PINCTRL_MESON and ARCH_REQUIRE_GPIOLIB
X-Git-Tag: v4.1-rc1~51^2~18^2~2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=ec9c06831e7fcd01e0cef6f1a0038b1a0b86de28;p=linux.git

ARM: meson: select PINCTRL_MESON and ARCH_REQUIRE_GPIOLIB

Make sure that the Meson pinctrl driver is built whenever Meson
support is enabled.

Signed-off-by: Beniamino Galvani <b.galvani@gmail.com>
Signed-off-by: Carlo Caione <carlo@endlessm.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
---

diff --git a/arch/arm/mach-meson/Kconfig b/arch/arm/mach-meson/Kconfig
index 18301dc9d2e7..0743e2059645 100644
--- a/arch/arm/mach-meson/Kconfig
+++ b/arch/arm/mach-meson/Kconfig
@@ -1,8 +1,11 @@
 menuconfig ARCH_MESON
 	bool "Amlogic Meson SoCs" if ARCH_MULTI_V7
+	select ARCH_REQUIRE_GPIOLIB
 	select GENERIC_IRQ_CHIP
 	select ARM_GIC
 	select CACHE_L2X0
+	select PINCTRL
+	select PINCTRL_MESON
 
 if ARCH_MESON