--- src/sys/dev/usbmisc/uhid/uhid.c	2007/07/02 06:43:31	1.27
+++ src/sys/dev/usbmisc/uhid/uhid.c	2007/07/02 23:52:05	1.28
@@ -155,7 +155,26 @@ static int uhid_do_read(struct uhid_soft
 static int uhid_do_write(struct uhid_softc *, struct uio *uio, int);
 static int uhid_do_ioctl(struct uhid_softc *, u_long, caddr_t, int);
 
-USB_DECLARE_DRIVER(uhid);
+static device_probe_t uhid_match;
+static device_attach_t uhid_attach;
+static device_detach_t uhid_detach;
+
+static devclass_t uhid_devclass;
+
+static kobj_method_t uhid_methods[] = {
+	DEVMETHOD(device_probe, uhid_match),
+	DEVMETHOD(device_attach, uhid_attach),
+	DEVMETHOD(device_detach, uhid_detach),
+	{0,0}
+};
+
+static driver_t uhid_driver = {
+	"uhid",
+	uhid_methods,
+	sizeof(struct uhid_softc)
+};
+
+MODULE_DEPEND(uhid, usb, 1, 1, 1);
 
 static int
 uhid_match(device_t self)