From: Tomasz Figa Date: Mon, 18 Mar 2013 21:31:51 +0000 (+0100) Subject: pinctrl: samsung: Include pinctrl-exynos driver data conditionally X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d5517bec272ce4732f7e86a72a1bb815834c912c;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git pinctrl: samsung: Include pinctrl-exynos driver data conditionally Since pinctrl-samsung is a common part of the pin control support for several Samsung SoCs, it can be compiled without Exynos support enabled. This patch surrounds Exynos-specific driver data with ifdefs to include them only when support for Exynos is enabled. Signed-off-by: Tomasz Figa [Fixed up EXYNOS4->EXYNOS] Signed-off-by: Linus Walleij --- diff --git a/drivers/pinctrl/pinctrl-samsung.c b/drivers/pinctrl/pinctrl-samsung.c index b1d4ac8d36f8..0df613134072 100644 --- a/drivers/pinctrl/pinctrl-samsung.c +++ b/drivers/pinctrl/pinctrl-samsung.c @@ -968,10 +968,12 @@ static int samsung_pinctrl_probe(struct platform_device *pdev) } static const struct of_device_id samsung_pinctrl_dt_match[] = { +#ifdef CONFIG_PINCTRL_EXYNOS { .compatible = "samsung,exynos4210-pinctrl", .data = (void *)exynos4210_pin_ctrl }, { .compatible = "samsung,exynos4x12-pinctrl", .data = (void *)exynos4x12_pin_ctrl }, +#endif {}, }; MODULE_DEVICE_TABLE(of, samsung_pinctrl_dt_match);