diff options
| author | Josef Karthauser <joe@FreeBSD.org> | 2003-07-14 18:37:47 +0000 |
|---|---|---|
| committer | Josef Karthauser <joe@FreeBSD.org> | 2003-07-14 18:37:47 +0000 |
| commit | 4dbc7c28261f053b39793053fe9bd844d79501ca (patch) | |
| tree | f394ac9c8d5d324319857deb4fefbf72456e7f74 /sys/dev/usb/uhub.c | |
| parent | 8c14b22d09eea1698714da1d4370cd25a673081a (diff) | |
| download | src-4dbc7c28261f053b39793053fe9bd844d79501ca.tar.gz src-4dbc7c28261f053b39793053fe9bd844d79501ca.zip | |
Merge up-to-date with NetBSD. No functional changes.
Notes
Notes:
svn path=/head/; revision=117571
Diffstat (limited to 'sys/dev/usb/uhub.c')
| -rw-r--r-- | sys/dev/usb/uhub.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c index 8bc0469a4aa7..068f51d2bdc0 100644 --- a/sys/dev/usb/uhub.c +++ b/sys/dev/usb/uhub.c @@ -1,10 +1,6 @@ -/* $NetBSD: uhub.c,v 1.61 2002/10/01 01:25:25 thorpej Exp $ */ +/* $NetBSD: uhub.c,v 1.64 2003/02/08 03:32:51 ichiro Exp $ */ /* $FreeBSD$ */ -/* Also already merged from netbsd: - * $NetBSD: uhub.c,v 1.64 2003/02/08 03:32:51 ichiro Exp $ - */ - /* * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. @@ -109,7 +105,7 @@ USB_DECLARE_DRIVER(uhub); /* Create the driver instance for the hub connected to hub case */ CFATTACH_DECL(uhub_uhub, sizeof(struct uhub_softc), - uhub_match, uhub_attach, uhub_detach, uhub_activate) + uhub_match, uhub_attach, uhub_detach, uhub_activate); #elif defined(__FreeBSD__) USB_DECLARE_DRIVER_INIT(uhub, DEVMETHOD(bus_driver_added, uhub_driver_added), |