summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2010-08-29 18:41:25 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2010-08-29 18:41:25 +0000
commit3c5c07892e280ce563a4eb6cdae0a1850cf50dc5 (patch)
tree7e255b1e23cce62172d57f9cc30385b7db3f66eb
parentf30e021350fc8932d9baa9b5bc475517c42d2807 (diff)
wdcactivate() can go since it is just a wrapper around
config_activate_children (same change made to wdc.c and wdcvar.h) ok kettenis
-rw-r--r--sys/dev/pcmcia/wdc_pcmcia.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/pcmcia/wdc_pcmcia.c b/sys/dev/pcmcia/wdc_pcmcia.c
index ecc14df6d92..bed15e261e3 100644
--- a/sys/dev/pcmcia/wdc_pcmcia.c
+++ b/sys/dev/pcmcia/wdc_pcmcia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wdc_pcmcia.c,v 1.21 2009/10/13 19:33:17 pirofti Exp $ */
+/* $OpenBSD: wdc_pcmcia.c,v 1.22 2010/08/29 18:41:24 deraadt Exp $ */
/* $NetBSD: wdc_pcmcia.c,v 1.19 1999/02/19 21:49:43 abs Exp $ */
/*-
@@ -466,13 +466,13 @@ wdc_pcmcia_activate(self, act)
}
wdcreset(&sc->wdc_channel, VERBOSE);
- rv = wdcactivate(self, act);
+ rv = config_activate_children(self, act);
break;
case DVACT_DEACTIVATE:
pcmcia_intr_disestablish(sc->sc_pf, sc->sc_ih);
pcmcia_function_disable(sc->sc_pf);
- rv = wdcactivate(self, act);
+ rv = config_activate_children(self, act);
break;
}
splx(s);