diff options
| author | Josef Karthauser <joe@FreeBSD.org> | 2003-07-14 18:25:47 +0000 |
|---|---|---|
| committer | Josef Karthauser <joe@FreeBSD.org> | 2003-07-14 18:25:47 +0000 |
| commit | d4322278faf0fcc990585727655deb9de0f10434 (patch) | |
| tree | 5b115fe4684f2bb3ff2616410061fbddae448cc7 /sys/dev/usb/uscanner.c | |
| parent | ed76a689f53d1edc483cf82770667adad5339110 (diff) | |
Notes
Diffstat (limited to 'sys/dev/usb/uscanner.c')
| -rw-r--r-- | sys/dev/usb/uscanner.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c index 78170069e57c..e3d275bcdcaf 100644 --- a/sys/dev/usb/uscanner.c +++ b/sys/dev/usb/uscanner.c @@ -1,6 +1,10 @@ /* $NetBSD: uscanner.c,v 1.30 2002/07/11 21:14:36 augustss Exp$ */ /* $FreeBSD$ */ +/* Also already merged from NetBSD: + * $NetBSD: uscanner.c,v 1.33 2002/09/23 05:51:24 simonb Exp $ + */ + /* * Copyright (c) 2000 The NetBSD Foundation, Inc. * All rights reserved. @@ -597,7 +601,6 @@ uscanner_activate(device_ptr_t self, enum devact act) switch (act) { case DVACT_ACTIVATE: return (EOPNOTSUPP); - break; case DVACT_DEACTIVATE: sc->sc_dying = 1; |