Author: mw Date: Tue Apr 3 23:49:35 2018 New Revision: 331966 URL: https://svnweb.freebsd.org/changeset/base/331966
Log: 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 <r...@semihalf.com> Obtained from: Semihalf Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D14743 Modified: head/sys/arm/mv/timer.c head/sys/dev/ahci/ahci_mv_fdt.c Modified: head/sys/arm/mv/timer.c ============================================================================== --- head/sys/arm/mv/timer.c Tue Apr 3 23:29:34 2018 (r331965) +++ head/sys/arm/mv/timer.c Tue Apr 3 23:49:35 2018 (r331966) @@ -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) Modified: head/sys/dev/ahci/ahci_mv_fdt.c ============================================================================== --- head/sys/dev/ahci/ahci_mv_fdt.c Tue Apr 3 23:29:34 2018 (r331965) +++ head/sys/dev/ahci/ahci_mv_fdt.c Tue Apr 3 23:49:35 2018 (r331966) @@ -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); _______________________________________________ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"