summaryrefslogtreecommitdiff
path: root/sys/dev/usb/uhidev.c
diff options
context:
space:
mode:
authorMarc Balmer <mbalmer@cvs.openbsd.org>2007-06-04 10:34:05 +0000
committerMarc Balmer <mbalmer@cvs.openbsd.org>2007-06-04 10:34:05 +0000
commite3b8f0e33e350d79d720bc14dc8076e8fc653e13 (patch)
tree25633eb3012d656fb4d1ac2dcec201cb9b4a6175 /sys/dev/usb/uhidev.c
parent9de2d85fb9a6ed44d53a03d680c99999da003cfc (diff)
Last part of FreeBSD/NetBSD sepcific code removal.
ok jsg@
Diffstat (limited to 'sys/dev/usb/uhidev.c')
-rw-r--r--sys/dev/usb/uhidev.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/sys/dev/usb/uhidev.c b/sys/dev/usb/uhidev.c
index 2f62fad3e92..27f5df90a0c 100644
--- a/sys/dev/usb/uhidev.c
+++ b/sys/dev/usb/uhidev.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uhidev.c,v 1.21 2007/05/27 04:00:25 jsg Exp $ */
+/* $OpenBSD: uhidev.c,v 1.22 2007/06/04 10:34:04 mbalmer Exp $ */
/* $NetBSD: uhidev.c,v 1.14 2003/03/11 16:44:00 augustss Exp $ */
/*
@@ -78,11 +78,7 @@ Static void uhidev_intr(usbd_xfer_handle, usbd_private_handle, usbd_status);
Static int uhidev_maxrepid(void *buf, int len);
Static int uhidevprint(void *aux, const char *pnp);
-#if defined(__NetBSD__)
-Static int uhidevsubmatch(struct device *parent, struct cfdata *cf, void *aux);
-#else
Static int uhidevsubmatch(struct device *parent, void *cf, void *aux);
-#endif
USB_DECLARE_DRIVER(uhidev);
@@ -328,16 +324,10 @@ uhidevprint(void *aux, const char *pnp)
return (UNCONF);
}
-#if defined(__NetBSD__)
-Static int uhidevsubmatch(struct device *parent, struct cfdata *cf, void *aux)
-#else
Static int uhidevsubmatch(struct device *parent, void *match, void *aux)
-#endif
{
struct uhidev_attach_arg *uha = aux;
-#if defined(__OpenBSD__)
struct cfdata *cf = match;
-#endif
if (cf->uhidevcf_reportid != UHIDEV_UNK_REPORTID &&
cf->uhidevcf_reportid != uha->reportid)