Hi Mark,
Today's linux-next merge of the regmap tree got a conflict in
drivers/mfd/wm831x-spi.c between commit 7ba771ee9c6f ("mfd: Support
software initiated shutdown of WM831x PMICs") from the mfd tree and
commit 5570c2f709bd ("mfd: Use device ID matching for WM831x SPI driver")
from the regmap tree.
I am not sure of the resolution here, so I just used the regmap tree
version (which drops the shutdown member of wm8311_spi_driver added in
the mfd version).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
