Index: boot/arch/amd64/Makefile.inc
===================================================================
--- boot/arch/amd64/Makefile.inc	(revision 5f8829315f6bebf5769560deb1bd34bc914628c4)
+++ boot/arch/amd64/Makefile.inc	(revision 74464e831800483feba22672d950a2eddcc0d953)
@@ -43,8 +43,8 @@
 	isa \
 	ns8250 \
-	ehci_hcd \
+	ehci\
 	ohci \
-	uhci_hcd \
-	uhci_rhd \
+	uhci \
+	uhcirh \
 	usbflbk \
 	usbhub \