Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/w1/masters/omap_hdq.c between commit 19afea50f12b ("w1: omap-hdq:
convert to devm_* functions") from the char-misc tree and commits
aefaf7be498b ("W1: OMAP HDQ1W: Remove dependencies to mach/hardware.h")
and 73f2989d37a3 ("w1: omap-hdq: drop ARCH dependency") from the arm-soc
tree.
The former patches removed some of the code fixed up by the latter and
the same include line, so I did that and can carry the fix as necessary
(no action is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpHtFrqMDzBz.pgp
Description: PGP signature
