From 0511fa0efd8ee3e37623d06630c56260f1771933 Mon Sep 17 00:00:00 2001 From: Olivier Houchard Date: Thu, 15 Feb 2018 15:46:14 +0000 Subject: [PATCH] Rename the ACPI variant of the gicv2m driver from "gicv2m" to "gicv2m_acpi". The FDT variant is called "gicv2m" too, and as both would try to register on gic, only one of them would succeed, while we want them both in a GENERIC kernel. Reviewed by: andrew --- sys/arm/arm/gic_acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/arm/gic_acpi.c b/sys/arm/arm/gic_acpi.c index d6a75a71e3a0..eda0fcec5b2d 100644 --- a/sys/arm/arm/gic_acpi.c +++ b/sys/arm/arm/gic_acpi.c @@ -342,5 +342,5 @@ DEFINE_CLASS_1(gicv2m, arm_gicv2m_acpi_driver, arm_gicv2m_acpi_methods, static devclass_t arm_gicv2m_acpi_devclass; -EARLY_DRIVER_MODULE(gicv2m, gic, arm_gicv2m_acpi_driver, +EARLY_DRIVER_MODULE(gicv2m_acpi, gic, arm_gicv2m_acpi_driver, arm_gicv2m_acpi_devclass, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);