Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/chipidea/Makefile between commit 8973ba8b325f ("usb:
chipidea: depend on CONFIG_OF instead of CONFIG_OF_DEVICE") from the
devicetree tree and commit 8e22978c5708 ("usb: chipidea: drop "13xxx"
infix") from the usb tree.I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell [email protected] diff --cc drivers/usb/chipidea/Makefile index 4113feb,3bbbcba..0000000 --- a/drivers/usb/chipidea/Makefile +++ b/drivers/usb/chipidea/Makefile @@@ -13,9 -13,9 +13,9 @@@ obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_m # PCI doesn't provide stubs, need to check ifneq ($(CONFIG_PCI),) - obj-$(CONFIG_USB_CHIPIDEA) += ci13xxx_pci.o + obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_pci.o endif -ifneq ($(CONFIG_OF_DEVICE),) +ifneq ($(CONFIG_OF),) - obj-$(CONFIG_USB_CHIPIDEA) += ci13xxx_imx.o usbmisc_imx.o + obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_imx.o usbmisc_imx.o endif
pgpfZ0QKXqPmB.pgp
Description: PGP signature
