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/usbdivar.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/usbdivar.h')
| -rw-r--r-- | sys/dev/usb/usbdivar.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/dev/usb/usbdivar.h b/sys/dev/usb/usbdivar.h index 1c65a5bb8ed..82fc1035e91 100644 --- a/sys/dev/usb/usbdivar.h +++ b/sys/dev/usb/usbdivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: usbdivar.h,v 1.31 2007/06/13 11:31:33 mbalmer Exp $ */ +/* $OpenBSD: usbdivar.h,v 1.32 2007/06/15 11:41:48 mbalmer Exp $ */ /* $NetBSD: usbdivar.h,v 1.70 2002/07/11 21:14:36 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usbdivar.h,v 1.11 1999/11/17 22:33:51 n_hibma Exp $ */ @@ -124,12 +124,8 @@ struct usbd_bus { #define USBREV_2_0 4 #define USBREV_STR { "unknown", "pre 1.0", "1.0", "1.1", "2.0" } -#ifdef USB_USE_SOFTINTR #ifdef __HAVE_GENERIC_SOFT_INTERRUPTS void *soft; /* soft interrupt cookie */ -#else - struct timeout softi; -#endif #endif bus_dma_tag_t dmatag; /* DMA tag */ }; |