Hi Linus,
Today's linux-next merge of the pinctrl tree got a conflict in
drivers/pinctrl/Makefile between commit 701016c0cba5 ("pinctrl: st: Add
pinctrl and pinconf support") from the regmap tree and commit
78bafc66180d ("pinctrl: add VF610 pinctrl driver") from the pinctrl 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/pinctrl/Makefile
index 6fc7844,cf699a5..0000000
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@@ -45,7 -50,7 +50,8 @@@ obj-$(CONFIG_PINCTRL_EXYNOS5440) += pin
obj-$(CONFIG_PINCTRL_S3C64XX) += pinctrl-s3c64xx.o
obj-$(CONFIG_PINCTRL_XWAY) += pinctrl-xway.o
obj-$(CONFIG_PINCTRL_LANTIQ) += pinctrl-lantiq.o
+obj-$(CONFIG_PINCTRL_ST) += pinctrl-st.o
+ obj-$(CONFIG_PINCTRL_VF610) += pinctrl-vf610.o
obj-$(CONFIG_PLAT_ORION) += mvebu/
obj-$(CONFIG_ARCH_SHMOBILE) += sh-pfc/
Attachment:
pgpGdBRcGbrlR.pgp
Description: PGP signature
