summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorMarc Balmer <mbalmer@cvs.openbsd.org>2007-06-10 10:15:36 +0000
committerMarc Balmer <mbalmer@cvs.openbsd.org>2007-06-10 10:15:36 +0000
commitba9346211f99b37c96aa619b9981b230c7b4a61d (patch)
treeccdeec5702822686e8702f14d705203c1db83ac3 /sys/arch
parente306807c0defd347a543fa24bbd4d248729fe129 (diff)
Remove definitions and usage of usb_callout and related macros. These macros
were used as a layer of confusion^Wabstraction around the timeout(9) API. No binary change. ok jsg.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/arm/xscale/pxa27x_udc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/arm/xscale/pxa27x_udc.c b/sys/arch/arm/xscale/pxa27x_udc.c
index 9fa8085174c..4e5258b991d 100644
--- a/sys/arch/arm/xscale/pxa27x_udc.c
+++ b/sys/arch/arm/xscale/pxa27x_udc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pxa27x_udc.c,v 1.19 2007/02/25 01:49:27 drahn Exp $ */
+/* $OpenBSD: pxa27x_udc.c,v 1.20 2007/06/10 10:15:35 mbalmer Exp $ */
/*
* Copyright (c) 2007 Dale Rahn <drahn@openbsd.org>
@@ -1159,7 +1159,7 @@ pxaudc_ctrl_abort(usbf_xfer_handle xfer)
*/
s = splusb();
xfer->status = USBF_CANCELLED;
- usb_uncallout(xfer->timeout_handle, pxaudc_timeout, NULL);
+ timeout_del(&xfer->timeout_handle);
splx(s);
/*