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