From c58ed0b07f1d886a557fb180a8a3296bc62a345c Mon Sep 17 00:00:00 2001 From: Marcin Wojtas Date: Tue, 3 Apr 2018 23:49:35 +0000 Subject: [PATCH] Fix kernel modules names for Marvell armv7 Two modules with the same name cannot be loaded, so Marvell specific drivers cannot have the same name as the generic drivers. Files with the same name, even in different folders overlaps their .o files, so in order to prepare for supporting Marvell platforms in GENERIC armv7 config, modify conflicting names. Submitted by: Rafal Kozik Obtained from: Semihalf Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D14743 --- sys/arm/mv/timer.c | 2 +- sys/dev/ahci/ahci_mv_fdt.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/arm/mv/timer.c b/sys/arm/mv/timer.c index 99c61b450f3..ed2f1fff87f 100644 --- a/sys/arm/mv/timer.c +++ b/sys/arm/mv/timer.c @@ -289,7 +289,7 @@ static driver_t mv_timer_driver = { static devclass_t mv_timer_devclass; -DRIVER_MODULE(timer, simplebus, mv_timer_driver, mv_timer_devclass, 0, 0); +DRIVER_MODULE(timer_mv, simplebus, mv_timer_driver, mv_timer_devclass, 0, 0); static unsigned mv_timer_get_timecount(struct timecounter *tc) diff --git a/sys/dev/ahci/ahci_mv_fdt.c b/sys/dev/ahci/ahci_mv_fdt.c index b5bc92339ba..b88ff271358 100644 --- a/sys/dev/ahci/ahci_mv_fdt.c +++ b/sys/dev/ahci/ahci_mv_fdt.c @@ -151,5 +151,5 @@ static driver_t ahci_driver = { sizeof(struct ahci_controller) }; -DRIVER_MODULE(ahci, simplebus, ahci_driver, ahci_devclass, NULL, NULL); -DRIVER_MODULE(ahci, ofwbus, ahci_driver, ahci_devclass, NULL, NULL); +DRIVER_MODULE(ahci_mv, simplebus, ahci_driver, ahci_devclass, NULL, NULL); +DRIVER_MODULE(ahci_mv, ofwbus, ahci_driver, ahci_devclass, NULL, NULL);