diff --git a/Makefile b/Makefile index d1eff329..43e8c0ea 100644 --- a/Makefile +++ b/Makefile @@ -49,6 +49,9 @@ subdir-ccflags-y += -DNV_V4L2_ASYNC_NF_SUBDEVICE_INIT_RENAME # Deprecate PCIED Error reporting pci_enable_pcie_error_reporting subdir-ccflags-y += -DNV_DROP_PCIE_ERROR_REPORTING + +# Split types and declaration of net/page_pool.h +subdir-ccflags-y += -DNV_SPLIT_PAGE_POOL_HEADER endif ifeq ($(CONFIG_TEGRA_VIRTUALIZATION),y) diff --git a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.h b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.h index dc3f1f98..83f302d1 100644 --- a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.h +++ b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.h @@ -37,7 +37,12 @@ #include #include #if IS_ENABLED(CONFIG_PAGE_POOL) +#if defined(NV_SPLIT_PAGE_POOL_HEADER) +#include +#include +#else #include +#endif #define ETHER_PAGE_POOL #endif #include