linux-next: manual merge of the pinctrl tree with Linus'tree
From: Stephen Rothwell
Date: Thu Dec 12 2013 - 23:03:00 EST
Hi Linus,
Today's linux-next merge of the pinctrl tree got a conflict in
drivers/pinctrl/sh-pfc/pfc-sh7372.c between commit 71493de7e55a ("sh-pfc:
sh7372: 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@xxxxxxxxxxxxxxxx>
diff --cc drivers/pinctrl/sh-pfc/pfc-sh7372.c
index cc097b693820,bcdd5c3cdcf0..000000000000
--- a/drivers/pinctrl/sh-pfc/pfc-sh7372.c
+++ b/drivers/pinctrl/sh-pfc/pfc-sh7372.c
@@@ -2584,8 -2573,8 +2573,8 @@@ static void __iomem *sh7372_pinmux_port
const struct sh7372_portcr_group *group =
&sh7372_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;
Attachment:
pgp00000.pgp
Description: PGP signature