summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/ic/wdc.c18
-rw-r--r--sys/dev/ic/wdcvar.h3
2 files changed, 2 insertions, 19 deletions
diff --git a/sys/dev/ic/wdc.c b/sys/dev/ic/wdc.c
index 97279e6c848..01d4d0afa15 100644
--- a/sys/dev/ic/wdc.c
+++ b/sys/dev/ic/wdc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wdc.c,v 1.107 2010/07/23 07:47:13 jsg Exp $ */
+/* $OpenBSD: wdc.c,v 1.108 2010/08/29 18:40:33 deraadt Exp $ */
/* $NetBSD: wdc.c,v 1.68 1999/06/23 19:00:17 bouyer Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -696,22 +696,6 @@ wdcprobe(struct channel_softc *chp)
return (ret_value);
}
-/*
- * Call activate routine of underlying devices.
- */
-int
-wdcactivate(struct device *self, int act)
-{
- int error = 0;
- int s;
-
- s = splbio();
- config_activate_children(self, act);
- splx(s);
-
- return (error);
-}
-
void
wdcattach(struct channel_softc *chp)
{
diff --git a/sys/dev/ic/wdcvar.h b/sys/dev/ic/wdcvar.h
index 4b2676ebf90..cdf9ca9b0cc 100644
--- a/sys/dev/ic/wdcvar.h
+++ b/sys/dev/ic/wdcvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: wdcvar.h,v 1.45 2010/05/09 15:46:17 jasper Exp $ */
+/* $OpenBSD: wdcvar.h,v 1.46 2010/08/29 18:40:33 deraadt Exp $ */
/* $NetBSD: wdcvar.h,v 1.17 1999/04/11 20:50:29 bouyer Exp $ */
/*-
@@ -262,7 +262,6 @@ struct wdc_xfer {
int wdcprobe(struct channel_softc *);
void wdcattach(struct channel_softc *);
int wdcdetach(struct channel_softc *, int);
-int wdcactivate(struct device *, int);
int wdcintr(void *);
void wdc_exec_xfer(struct channel_softc *, struct wdc_xfer *);
struct wdc_xfer *wdc_get_xfer(int); /* int = WDC_NOSLEEP/CANSLEEP */