Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/host/ehci-vt8500.c between commit 148e11349b0c ("usb: Convert
to devm_ioremap_resource()") from the driver-core tree and commit
d57ada0c37ec ("USB: EHCI: make ehci-vt8500 a separate driver") from the
usb tree.I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell s...@canb.auug.org.au diff --cc drivers/usb/host/ehci-vt8500.c index 7ecf709,98d65bd..0000000 --- a/drivers/usb/host/ehci-vt8500.c +++ b/drivers/usb/host/ehci-vt8500.c @@@ -16,7 -16,12 +16,13 @@@ * */ +#include <linux/err.h> + #include <linux/kernel.h> + #include <linux/module.h> + #include <linux/usb.h> + #include <linux/usb/hcd.h> + #include <linux/io.h> + #include <linux/dma-mapping.h> #include <linux/of.h> #include <linux/platform_device.h>
pgpsubT0pdnvL.pgp
Description: PGP signature
