From: Paolo Abeni <pabeni@redhat.com> Date: Thu, 8 Sep 2022 16:34:54 +0000 (+0200) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9f8f1933dce555d3c246f447f54fca8de8889da9;p=users%2Fjedix%2Flinux-maple.git Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net drivers/net/ethernet/freescale/fec.h 7d650df99d52 ("net: fec: add pm_qos support on imx6q platform") 40c79ce13b03 ("net: fec: add stop mode support for imx8 platform") Signed-off-by: Paolo Abeni <pabeni@redhat.com> --- 9f8f1933dce555d3c246f447f54fca8de8889da9 diff --cc drivers/net/ethernet/freescale/fec.h index 68bc16058bae,d77ee8936c6a..99cfe6ab41fc --- a/drivers/net/ethernet/freescale/fec.h +++ b/drivers/net/ethernet/freescale/fec.h @@@ -16,10 -16,9 +16,11 @@@ #include <linux/clocksource.h> #include <linux/net_tstamp.h> + #include <linux/pm_qos.h> #include <linux/ptp_clock_kernel.h> #include <linux/timecounter.h> +#include <dt-bindings/firmware/imx/rsrc.h> +#include <linux/firmware/imx/sci.h> #if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \ defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_ARM) || \