Today's linux-next merge of the imx-mxs tree got a conflict in arch/arm/mach-imx/mach-imx6q.c caused by commits 6aec339 (PM / OPP: rename header to linux/pm_opp.h) and 0794410 (imx: add PCI fixup for PEX860X on Gateworks board). I fixed it up (see below). Please verify that the resolution looks good. Thanks, Thierry --- diff --cc arch/arm/mach-imx/mach-imx6q.c index eae5642,1ac719d..bc98799 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c @@@ -23,8 -23,9 +23,10 @@@ #include <linux/of_address.h> #include <linux/of_irq.h> #include <linux/of_platform.h> - #include <linux/pm_opp.h> + #include <linux/opp.h> + #include <linux/pci.h> #include <linux/phy.h> ++#include <linux/pm_opp.h> #include <linux/reboot.h> #include <linux/regmap.h> #include <linux/micrel_phy.h> -- 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
