linux-next: manual merge of the samsung tree with the mips tree

From: Stephen Rothwell
Date: Mon Sep 10 2012 - 01:46:08 EST

Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
drivers/pinctrl/Makefile between commit 3fa68afc3d77 ("OF: pinctrl: MIPS:
lantiq: implement lantiq/xway pinctrl support") from the mips tree and
commit 30574f0db1b1 ("pinctrl: add samsung pinctrl and gpiolib driver")
from the samsung tree.

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

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/pinctrl/Makefile
index 26a86c7,6a88113..0000000
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@@ -33,7 -29,7 +33,9 @@@ obj-$(CONFIG_PINCTRL_TEGRA20) += pinctr
obj-$(CONFIG_PINCTRL_TEGRA30) += pinctrl-tegra30.o
obj-$(CONFIG_PINCTRL_U300) += pinctrl-u300.o
obj-$(CONFIG_PINCTRL_COH901) += pinctrl-coh901.o
+obj-$(CONFIG_PINCTRL_XWAY) += pinctrl-xway.o
+obj-$(CONFIG_PINCTRL_LANTIQ) += pinctrl-lantiq.o
+ obj-$(CONFIG_PINCTRL_SAMSUNG) += pinctrl-samsung.o
+ obj-$(CONFIG_PINCTRL_EXYNOS4) += pinctrl-exynos.o

obj-$(CONFIG_PLAT_SPEAR) += spear/

Attachment: pgp00000.pgp
Description: PGP signature