summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2009-11-23 15:21:06 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2009-11-23 15:21:06 +0000
commit4261325cd1c9de909ff50268d7d78246543574bc (patch)
treea10dc8c74e5ec981eaf39667de138e44393aa1af /sys/arch
parentc3fb7cf418d623d44f1f42f6ed17805b9714e360 (diff)
Use config_activate_children() for our cf_activate function
ok mlarkin pirofti
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/amd64/amd64/mainbus.c5
-rw-r--r--sys/arch/i386/i386/mainbus.c5
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/arch/amd64/amd64/mainbus.c b/sys/arch/amd64/amd64/mainbus.c
index 3cfd3ab5585..faa06548b71 100644
--- a/sys/arch/amd64/amd64/mainbus.c
+++ b/sys/arch/amd64/amd64/mainbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mainbus.c,v 1.19 2009/04/21 19:18:09 kettenis Exp $ */
+/* $OpenBSD: mainbus.c,v 1.20 2009/11/23 15:21:05 deraadt Exp $ */
/* $NetBSD: mainbus.c,v 1.1 2003/04/26 18:39:29 fvdl Exp $ */
/*
@@ -67,7 +67,8 @@ int mainbus_match(struct device *, void *, void *);
void mainbus_attach(struct device *, struct device *, void *);
struct cfattach mainbus_ca = {
- sizeof(struct device), mainbus_match, mainbus_attach
+ sizeof(struct device), mainbus_match, mainbus_attach, NULL,
+ config_suspend_children
};
struct cfdriver mainbus_cd = {
diff --git a/sys/arch/i386/i386/mainbus.c b/sys/arch/i386/i386/mainbus.c
index eeaa040ca42..b730f96574f 100644
--- a/sys/arch/i386/i386/mainbus.c
+++ b/sys/arch/i386/i386/mainbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mainbus.c,v 1.45 2009/04/11 17:13:32 kettenis Exp $ */
+/* $OpenBSD: mainbus.c,v 1.46 2009/11/23 15:21:05 deraadt Exp $ */
/* $NetBSD: mainbus.c,v 1.21 1997/06/06 23:14:20 thorpej Exp $ */
/*
@@ -89,7 +89,8 @@ int mainbus_match(struct device *, void *, void *);
void mainbus_attach(struct device *, struct device *, void *);
struct cfattach mainbus_ca = {
- sizeof(struct device), mainbus_match, mainbus_attach
+ sizeof(struct device), mainbus_match, mainbus_attach,
+ NULL, config_activate_children
};
struct cfdriver mainbus_cd = {