Index: sys/arm/conf/ARMADA38X
===================================================================
--- sys/arm/conf/ARMADA38X
+++ sys/arm/conf/ARMADA38X
@@ -48,9 +48,6 @@
 # PCI
 device		pci
 
-# RTC
-device		mv_rtc
-
 # Interrupt controllers
 device		gic
 options 	INTRNG
Index: sys/arm/mv/timer.c
===================================================================
--- sys/arm/mv/timer.c
+++ sys/arm/mv/timer.c
@@ -291,7 +291,7 @@
 
 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)
Index: sys/dev/ahci/ahci_mv_fdt.c
===================================================================
--- sys/dev/ahci/ahci_mv_fdt.c
+++ sys/dev/ahci/ahci_mv_fdt.c
@@ -151,5 +151,5 @@
 	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);