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/usbdivar.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/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 */ }; |