Messages in this thread |  | | Date | Fri, 13 Dec 2013 15:01:02 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the pinctrl tree with Linus' tree |
| |
Hi Linus,
Today's linux-next merge of the pinctrl tree got a conflict in drivers/pinctrl/sh-pfc/pfc-r8a7740.c between commit 5d27619498ab ("sh-pfc: r8a7740: Fix pin bias setup") from Linus' tree and commit 5b46ac3a7723 ("sh-pfc: Rename sh_pfc window field to windows") 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@canb.auug.org.au>
diff --cc drivers/pinctrl/sh-pfc/pfc-r8a7740.c index bc5eb453a45c,a189b962a1eb..000000000000 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7740.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7740.c @@@ -3720,8 -3709,8 +3709,8 @@@ static void __iomem *r8a7740_pinmux_por const struct r8a7740_portcr_group *group = &r8a7740_portcr_offsets[i]; - if (i <= group->end_pin) + if (pin <= group->end_pin) - return pfc->window->virt + group->offset + pin; + return pfc->windows->virt + group->offset + pin; } return NULL; [unhandled content-type:application/pgp-signature] |  |