Index: boot/arch/amd64/Makefile.inc
===================================================================
--- boot/arch/amd64/Makefile.inc	(revision d23fab97e57b15cd1fbea89eab8cc010012d018b)
+++ boot/arch/amd64/Makefile.inc	(revision 7d957b20978eb7a4e4741ee6fbda6c0e33c08ddf)
@@ -49,5 +49,5 @@
 	bus/usb/ohci \
 	bus/usb/uhci \
-	bus/usb/usbdbg \
+	bus/usb/usbdiag \
 	bus/usb/usbflbk \
 	bus/usb/usbhub \
Index: boot/arch/arm32/Makefile.inc
===================================================================
--- boot/arch/arm32/Makefile.inc	(revision d23fab97e57b15cd1fbea89eab8cc010012d018b)
+++ boot/arch/arm32/Makefile.inc	(revision 7d957b20978eb7a4e4741ee6fbda6c0e33c08ddf)
@@ -83,5 +83,5 @@
 	bus/usb/ehci \
 	bus/usb/ohci \
-	bus/usb/usbdbg \
+	bus/usb/usbdiag \
 	bus/usb/usbflbk \
 	bus/usb/usbhub \
Index: boot/arch/ia64/Makefile.inc
===================================================================
--- boot/arch/ia64/Makefile.inc	(revision d23fab97e57b15cd1fbea89eab8cc010012d018b)
+++ boot/arch/ia64/Makefile.inc	(revision 7d957b20978eb7a4e4741ee6fbda6c0e33c08ddf)
@@ -80,5 +80,5 @@
 	bus/usb/ohci \
 	bus/usb/uhci \
-	bus/usb/usbdbg \
+	bus/usb/usbdiag \
 	bus/usb/usbflbk \
 	bus/usb/usbhub \
Index: boot/arch/ppc32/Makefile.inc
===================================================================
--- boot/arch/ppc32/Makefile.inc	(revision d23fab97e57b15cd1fbea89eab8cc010012d018b)
+++ boot/arch/ppc32/Makefile.inc	(revision 7d957b20978eb7a4e4741ee6fbda6c0e33c08ddf)
@@ -47,5 +47,5 @@
 	bus/pci/pciintel \
 	bus/usb/ohci \
-	bus/usb/usbdbg \
+	bus/usb/usbdiag \
 	bus/usb/usbflbk \
 	bus/usb/usbhub \