diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-05-30 16:15:03 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-05-30 16:15:03 +0000 |
| commit | 0a2136fff807fb71339f3d499b31f09ef14bf891 (patch) | |
| tree | 8996416e2647c8beebebaa3a97c2205aed0adce3 /sys/dev/cardbus | |
| parent | 52c68f7659b12bec7c8ef0539aca056f2550327b (diff) | |
Enforce ca_activate tree-walks over the entire heirarchy for all events,
cleaning up some shutdown-hook related code on the way.
(A few drivers related to sparc are still skipped at kettenis' request)
ok kettenis mlarkin, tested by many others too
Diffstat (limited to 'sys/dev/cardbus')
| -rw-r--r-- | sys/dev/cardbus/cardbus.c | 5 | ||||
| -rw-r--r-- | sys/dev/cardbus/cardslot.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c index 6786f0fb293..4e8d4d814e8 100644 --- a/sys/dev/cardbus/cardbus.c +++ b/sys/dev/cardbus/cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cardbus.c,v 1.45 2010/08/25 21:37:59 kettenis Exp $ */ +/* $OpenBSD: cardbus.c,v 1.46 2013/05/30 16:15:01 deraadt Exp $ */ /* $NetBSD: cardbus.c,v 1.24 2000/04/02 19:11:37 mycroft Exp $ */ /* @@ -83,8 +83,7 @@ STATIC void disable_function(struct cardbus_softc *, int); struct cfattach cardbus_ca = { - sizeof(struct cardbus_softc), cardbusmatch, cardbusattach, - NULL, config_activate_children + sizeof(struct cardbus_softc), cardbusmatch, cardbusattach }; struct cfdriver cardbus_cd = { diff --git a/sys/dev/cardbus/cardslot.c b/sys/dev/cardbus/cardslot.c index 0061e48ec32..d4fb6b41f85 100644 --- a/sys/dev/cardbus/cardslot.c +++ b/sys/dev/cardbus/cardslot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cardslot.c,v 1.14 2010/08/25 21:37:59 kettenis Exp $ */ +/* $OpenBSD: cardslot.c,v 1.15 2013/05/30 16:15:01 deraadt Exp $ */ /* $NetBSD: cardslot.c,v 1.9 2000/03/22 09:35:06 haya Exp $ */ /* @@ -68,8 +68,7 @@ STATIC int cardslot_16_print(void *, const char *); STATIC int cardslot_16_submatch(struct device *, void *,void *); struct cfattach cardslot_ca = { - sizeof(struct cardslot_softc), cardslotmatch, cardslotattach, - NULL, config_activate_children + sizeof(struct cardslot_softc), cardslotmatch, cardslotattach }; struct cfdriver cardslot_cd = { |