From mboxrd@z Thu Jan 1 00:00:00 1970 From: heiko@sntech.de (Heiko =?utf-8?q?St=C3=BCbner?=) Date: Tue, 9 Jul 2013 02:12:31 +0200 Subject: [PATCH] gpio: samsung: more generic pinctrl exclude ifdef Message-ID: <201307090212.31422.heiko@sntech.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org The exclude check should run any time when either the PINCTRL_SAMSUNG or PINCTRL_EXYNOS5440 are selected. As the real check for the presence of a pinctrl driver is done via a dt lookup it's not necessary to specifiy every pinctrl option in the ifdef individually. This fixes a breakage on s3c2416, when both the legacy and dt boards are selected. Signed-off-by: Heiko Stuebner --- Extracted from Tomasz pinctrl series, as it fixes a bug in the current 3.11 development. drivers/gpio/gpio-samsung.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c index a1392f4..ceb7971 100644 --- a/drivers/gpio/gpio-samsung.c +++ b/drivers/gpio/gpio-samsung.c @@ -2949,7 +2949,7 @@ static __init int samsung_gpiolib_init(void) int i, nr_chips; int group = 0; -#if defined(CONFIG_PINCTRL_EXYNOS) || defined(CONFIG_PINCTRL_EXYNOS5440) +#if defined(CONFIG_PINCTRL_SAMSUNG) || defined(CONFIG_PINCTRL_EXYNOS5440) /* * This gpio driver includes support for device tree support and there * are platforms using it. In order to maintain compatibility with those -- 1.7.10.4