The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=16295b0a5a577aa70f47d3b3314277e631caee63
commit 16295b0a5a577aa70f47d3b3314277e631caee63 Author: Bjoern A. Zeeb <[email protected]> AuthorDate: 2022-10-24 20:54:20 +0000 Commit: Bjoern A. Zeeb <[email protected]> CommitDate: 2022-10-24 21:24:32 +0000 dpaa2: cleanup some include files 2782ed8f6cd3d7f59219a783bc7fa7bbfb1fe26f fixed the standalone module build. REmove the now duplicate includes for opt_acpi.h and opt_platform.h. Als remove the if_mdio.h again in both the Makefile and the implementation file as it is not (currently) used. X-MFC with: ba7319e9091b4f6ef15a9c4be3d3d076f3047f72 MFC after: 70 days --- sys/dev/dpaa2/dpaa2_ni.c | 1 - sys/modules/dpaa2/Makefile | 3 --- 2 files changed, 4 deletions(-) diff --git a/sys/dev/dpaa2/dpaa2_ni.c b/sys/dev/dpaa2/dpaa2_ni.c index f368a3b0e40f..f62d6c1b6f29 100644 --- a/sys/dev/dpaa2/dpaa2_ni.c +++ b/sys/dev/dpaa2/dpaa2_ni.c @@ -85,7 +85,6 @@ __FBSDID("$FreeBSD$"); #include "pcib_if.h" #include "pci_if.h" #include "miibus_if.h" -#include "mdio_if.h" #include "memac_mdio_if.h" #include "dpaa2_types.h" diff --git a/sys/modules/dpaa2/Makefile b/sys/modules/dpaa2/Makefile index fa280452bcfa..eeb9e7f340bf 100644 --- a/sys/modules/dpaa2/Makefile +++ b/sys/modules/dpaa2/Makefile @@ -19,13 +19,11 @@ SRCS+= memac_mdio_common.c memac_mdio_if.c memac_mdio_if.h SRCS+= bus_if.h device_if.h miibus_if.h SRCS+= pcib_if.h pci_if.h -SRCS+= mdio_if.h SRCS+= opt_acpi.h opt_platform.h .if !empty(OPT_ACPI) SRCS+= dpaa2_mc_acpi.c \ memac_mdio_acpi.c \ - opt_acpi.h \ acpi_if.h \ acpi_bus_if.h .endif @@ -33,7 +31,6 @@ SRCS+= dpaa2_mc_acpi.c \ .if !empty(OPT_FDT) SRCS+= dpaa2_mc_fdt.c \ memac_mdio_fdt.c \ - opt_platform.h \ ofw_bus_if.h .endif
