archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the imx-mxs tree with the pinctrl tree
@ 2013-04-05  4:42 Stephen Rothwell
  0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2013-04-05  4:42 UTC (permalink / raw)
  To: Shawn Guo; +Cc: linux-next, linux-kernel, Haojian Zhuang, Linus Walleij

[-- Attachment #1: Type: text/plain, Size: 1149 bytes --]

Hi Shawn,

Today's linux-next merge of the imx-mxs tree got a conflict in
drivers/pinctrl/Makefile between commit 62194200e5e3 ("pinctrl: remove
pxa pinctrl driver") from the pinctrl tree and commit b8979245b6ff
("pinctrl: add pinctrl driver for imx6dl") from the imx-mxs tree.

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

Stephen Rothwell          

diff --cc drivers/pinctrl/Makefile
index 82db76c,8bdaf23..0000000
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@@ -21,7 -21,10 +21,8 @@@ obj-$(CONFIG_PINCTRL_IMX35)	+= pinctrl-
  obj-$(CONFIG_PINCTRL_IMX51)	+= pinctrl-imx51.o
  obj-$(CONFIG_PINCTRL_IMX53)	+= pinctrl-imx53.o
  obj-$(CONFIG_PINCTRL_IMX6Q)	+= pinctrl-imx6q.o
+ obj-$(CONFIG_PINCTRL_IMX6Q)	+= pinctrl-imx6dl.o
 -obj-$(CONFIG_PINCTRL_PXA3xx)	+= pinctrl-pxa3xx.o
  obj-$(CONFIG_PINCTRL_FALCON)	+= pinctrl-falcon.o
 -obj-$(CONFIG_PINCTRL_MMP2)	+= pinctrl-mmp2.o
  obj-$(CONFIG_PINCTRL_MXS)	+= pinctrl-mxs.o
  obj-$(CONFIG_PINCTRL_IMX23)	+= pinctrl-imx23.o
  obj-$(CONFIG_PINCTRL_IMX28)	+= pinctrl-imx28.o

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2013-04-05  4:42 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-04-05  4:42 linux-next: manual merge of the imx-mxs tree with the pinctrl tree Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).