Add modules for the HCI part of USB. This is convenient when having a UHCI

controller in your laptop but inserting a (OHCI-based) Option Cardbus card.

sys/dev/usb/ehci_pci.c

@@ -623,3 +623,4 @@ static devclass_t ehci_devclass;
 
 DRIVER_MODULE(ehci, pci, ehci_driver, ehci_devclass, 0, 0);
 DRIVER_MODULE(ehci, cardbus, ehci_driver, ehci_devclass, 0, 0);
+MODULE_DEPEND(ehci, usb, 1, 1, 1);

sys/dev/usb/ohci_pci.c

@@ -408,3 +408,4 @@ static devclass_t ohci_devclass;
 
 DRIVER_MODULE(ohci, pci, ohci_driver, ohci_devclass, 0, 0);
 DRIVER_MODULE(ohci, cardbus, ohci_driver, ohci_devclass, 0, 0);
+MODULE_DEPEND(ohci, usb, 1, 1, 1);

sys/dev/usb/slhci_pccard.c

@@ -199,6 +199,8 @@ static driver_t	slhci_pccard_driver = {
 	slhci_pccard_methods,
 	sizeof(struct slhci_softc),
 };
+
 devclass_t	slhci_devclass;
-MODULE_DEPEND(slhci, usb, 1, 1, 1);
+
 DRIVER_MODULE(slhci, pccard, slhci_pccard_driver, slhci_devclass, 0, 0);
+MODULE_DEPEND(slhci, usb, 1, 1, 1);

sys/dev/usb/uhci_pci.c

@@ -515,3 +515,4 @@ static devclass_t uhci_devclass;
 
 DRIVER_MODULE(uhci, pci, uhci_driver, uhci_devclass, 0, 0);
 DRIVER_MODULE(uhci, cardbus, uhci_driver, uhci_devclass, 0, 0);
+MODULE_DEPEND(uhci, usb, 1, 1, 1);

sys/modules/Makefile

@@ -79,6 +79,7 @@ SUBDIR=	${_3dfx} \
 	${_dtrace} \
 	dummynet \
 	${_ed} \
+	ehci \
 	${_elink} \
 	${_em} \
 	en \
@@ -205,6 +206,7 @@ SUBDIR=	${_3dfx} \
 	${_nwfs} \
 	${_nxge} \
 	${_opensolaris} \
+	ohci \
 	${_padlock} \
 	patm \
 	${_pccard} \
@@ -241,6 +243,7 @@ SUBDIR=	${_3dfx} \
 	${_scsi_low} \
 	sem \
 	sf \
+	slhci \
 	sis \
 	sk \
 	${_smbfs} \
@@ -280,6 +283,7 @@ SUBDIR=	${_3dfx} \
 	ufoma \
 	uftdi \
 	ugen \
+	uhci \
 	uhid \
 	uipaq \
 	ukbd \

sys/modules/ehci/Makefile

@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+S=	${.CURDIR}/../..
+
+.PATH: $S/dev/usb $S/pci
+
+KMOD=	ehci
+SRCS=	bus_if.h device_if.h \
+	opt_usb.h \
+	ehci_pci.c ehci.c ehcireg.h ehcivar.h \
+	pci_if.h
+
+.include <bsd.kmod.mk>

sys/modules/ohci/Makefile

@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+S=	${.CURDIR}/../..
+
+.PATH: $S/dev/usb $S/pci
+
+KMOD=	ohci
+SRCS=	bus_if.h device_if.h \
+	opt_usb.h \
+	ohci_pci.c ohci.c ohcireg.h ohcivar.h \
+	pci_if.h
+
+.include <bsd.kmod.mk>

sys/modules/slhci/Makefile

@@ -5,6 +5,8 @@
 KMOD=	slhci
 SRCS=	sl811hs.c slhci_pccard.c
 
-SRCS+= opt_slhci.h opt_usb.h device_if.h bus_if.h usbdevs.h card_if.h power_if.h pccarddevs.h
+SRCS+=	bus_if.h device_if.h card_if.h power_if.h \
+	usbdevs.h pccarddevs.h \
+	opt_slhci.h opt_usb.h \
 
 .include <bsd.kmod.mk>

sys/modules/uhci/Makefile

@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+S=	${.CURDIR}/../..
+
+.PATH: $S/dev/usb $S/pci
+
+KMOD=	uhci
+SRCS=	bus_if.h device_if.h \
+	opt_usb.h \
+	uhci_pci.c uhci.c uhcireg.h uhcivar.h \
+	pci_if.h
+
+.include <bsd.kmod.mk>