diff options
author | Marc Balmer <mbalmer@cvs.openbsd.org> | 2007-06-15 11:41:49 +0000 |
---|---|---|
committer | Marc Balmer <mbalmer@cvs.openbsd.org> | 2007-06-15 11:41:49 +0000 |
commit | d5374dd01d2f6af90f30df7bb1c09645b012fa87 (patch) | |
tree | f4aff9e964677bbed37e0f27ce4b5660ddfefc53 /sys/dev/usb/usbdi.h | |
parent | 35246e47ec18c704be9c8cc1633d3fd0cf84269c (diff) |
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 |