linux-next: manual merge of the samsung tree with the gpio-lw tree

[Stephen Rothwell]

Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
drivers/gpio/gpio-samsung.c between commit 6948ce588bd7 ("gpio: samsung:
skip gpio lib registration for EXYNOS5440") from the gpio-lw tree and
commit bda7f6d4e198 ("gpio: samsung: skip gpiolib registration if pinctrl
support is enabled for exynos5250") from the samsung tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/gpio/gpio-samsung.c
index 76be7ee,0d46db6..0000000
--- a/drivers/gpio/gpio-samsung.c
+++ b/drivers/gpio/gpio-samsung.c
@@@ -3025,7 -3025,7 +3024,8 @@@ static __init int samsung_gpiolib_init(
  	static const struct of_device_id exynos_pinctrl_ids[] = {
  		{ .compatible = "samsung,pinctrl-exynos4210", },
  		{ .compatible = "samsung,pinctrl-exynos4x12", },
+ 		{ .compatible = "samsung,pinctrl-exynos5250", },
 +		{ .compatible = "samsung,pinctrl-exynos5440", },
  	};
  	for_each_matching_node(pctrl_np, exynos_pinctrl_ids)
  		if (pctrl_np && of_device_is_available(pctrl_np))

Attachment: pgp00000.pgp
Description: PGP signature