diff options
| author |   mbalmer <mbalmer@openbsd.org> | 2007-06-15 11:41:47 +0000 |
|---|---|---|
| committer | mbalmer <mbalmer@openbsd.org> | 2007-06-15 11:41:47 +0000 |
| commit | 553f3c93ebab1cd19a85340a3ab332f0c1b84dfc (patch) | |
| tree | f1b0416776a4d2a2814614c4143e53ea323d206d /sys/dev/usb/usbdi.h | |
| parent | in pf_test_rule, before handling IPPROTO_ICMP / IPPROTO_ICMPV6, check that (diff) | |
| download | wireguard-openbsd-553f3c93ebab1cd19a85340a3ab332f0c1b84dfc.tar.xz wireguard-openbsd-553f3c93ebab1cd19a85340a3ab332f0c1b84dfc.zip | |
Replace the USB_USE_SOFTINTR macro with __HAVE_GENERIC_SOFT_INTTERUPTS
(which was used to define USB_USE_SOFTINTR).
No binary changes.
ok dlg, mk.
Diffstat (limited to 'sys/dev/usb/usbdi.h')
| -rw-r--r-- | sys/dev/usb/usbdi.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sys/dev/usb/usbdi.h b/sys/dev/usb/usbdi.h index e2fdc47e53b..ba995871b1b 100644 --- a/sys/dev/usb/usbdi.h +++ b/sys/dev/usb/usbdi.h @@ -1,4 +1,4 @@ -/* $OpenBSD: usbdi.h,v 1.27 2007/06/12 16:26:37 mbalmer Exp $ */ +/* $OpenBSD: usbdi.h,v 1.28 2007/06/15 11:41:48 mbalmer Exp $ */ /* $NetBSD: usbdi.h,v 1.62 2002/07/11 21:14:35 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usbdi.h,v 1.18 1999/11/17 22:33:49 n_hibma Exp $ */ @@ -253,14 +253,10 @@ struct usb_attach_arg { #define UMATCH_NONE 0 /* XXX Perhaps USB should have its own levels? */ -#ifdef USB_USE_SOFTINTR #ifdef __HAVE_GENERIC_SOFT_INTERRUPTS #define splusb splsoftnet #else -#define splusb splsoftclock -#endif /* __HAVE_GENERIC_SOFT_INTERRUPTS */ -#else #define splusb splbio -#endif /* USB_USE_SOFTINTR */ +#endif /* __HAVE_GENERIC_SOFT_INTERRUPTS */ #define splhardusb splbio #define IPL_USB IPL_BIO |