diff options
author | 2010-07-08 20:17:54 +0000 | |
---|---|---|
committer | 2010-07-08 20:17:54 +0000 | |
commit | 8b455e25f802054d4dec3b718d3e53811457f8fb (patch) | |
tree | 4d72246a4201b2f5d344e8938b292b580672569a | |
parent | Devices which don't have read or write functionality should not return (diff) | |
download | wireguard-openbsd-8b455e25f802054d4dec3b718d3e53811457f8fb.tar.xz wireguard-openbsd-8b455e25f802054d4dec3b718d3e53811457f8fb.zip |
use config_activate_children to get down to the isa bus activation code
-rw-r--r-- | sys/arch/amd64/pci/pcib.c | 5 | ||||
-rw-r--r-- | sys/arch/i386/pci/ichpcib.c | 6 | ||||
-rw-r--r-- | sys/arch/i386/pci/pcib.c | 5 | ||||
-rw-r--r-- | sys/arch/i386/pci/piixpcib.c | 6 |
4 files changed, 14 insertions, 8 deletions
diff --git a/sys/arch/amd64/pci/pcib.c b/sys/arch/amd64/pci/pcib.c index 05b28cc5384..86cbe212d06 100644 --- a/sys/arch/amd64/pci/pcib.c +++ b/sys/arch/amd64/pci/pcib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcib.c,v 1.4 2009/05/18 17:50:24 jsg Exp $ */ +/* $OpenBSD: pcib.c,v 1.5 2010/07/08 20:17:54 deraadt Exp $ */ /* $NetBSD: pcib.c,v 1.6 1997/06/06 23:29:16 thorpej Exp $ */ /*- @@ -50,7 +50,8 @@ void pcib_callback(struct device *); int pcib_print(void *, const char *); struct cfattach pcib_ca = { - sizeof(struct device), pcibmatch, pcibattach + sizeof(struct device), pcibmatch, pcibattach, + NULL, config_activate_children }; struct cfdriver pcib_cd = { diff --git a/sys/arch/i386/pci/ichpcib.c b/sys/arch/i386/pci/ichpcib.c index 3bdd1e4bf08..3ae1ea50d04 100644 --- a/sys/arch/i386/pci/ichpcib.c +++ b/sys/arch/i386/pci/ichpcib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ichpcib.c,v 1.24 2010/04/20 22:05:41 tedu Exp $ */ +/* $OpenBSD: ichpcib.c,v 1.25 2010/07/08 20:17:54 deraadt Exp $ */ /* * Copyright (c) 2004 Alexander Yurchenko <grange@openbsd.org> * @@ -74,7 +74,9 @@ struct timecounter ichpcib_timecounter = { struct cfattach ichpcib_ca = { sizeof(struct ichpcib_softc), ichpcib_match, - ichpcib_attach + ichpcib_attach, + NULL, + config_activate_children }; struct cfdriver ichpcib_cd = { diff --git a/sys/arch/i386/pci/pcib.c b/sys/arch/i386/pci/pcib.c index fa30a13b87e..75bffbe51e4 100644 --- a/sys/arch/i386/pci/pcib.c +++ b/sys/arch/i386/pci/pcib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcib.c,v 1.22 2009/05/18 17:50:24 jsg Exp $ */ +/* $OpenBSD: pcib.c,v 1.23 2010/07/08 20:17:54 deraadt Exp $ */ /* $NetBSD: pcib.c,v 1.6 1997/06/06 23:29:16 thorpej Exp $ */ /*- @@ -54,7 +54,8 @@ void pcib_callback(struct device *); int pcib_print(void *, const char *); struct cfattach pcib_ca = { - sizeof(struct device), pcibmatch, pcibattach + sizeof(struct device), pcibmatch, pcibattach, NULL, + config_activate_children }; struct cfdriver pcib_cd = { diff --git a/sys/arch/i386/pci/piixpcib.c b/sys/arch/i386/pci/piixpcib.c index a8844ecb353..cc0370ea5e1 100644 --- a/sys/arch/i386/pci/piixpcib.c +++ b/sys/arch/i386/pci/piixpcib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: piixpcib.c,v 1.6 2010/04/20 22:05:41 tedu Exp $ */ +/* $OpenBSD: piixpcib.c,v 1.7 2010/07/08 20:17:54 deraadt Exp $ */ /* * Copyright (c) 2007 Stefan Sperling <stsp@stsp.in-berlin.de> @@ -117,7 +117,9 @@ extern void p3_update_cpuspeed(void); struct cfattach piixpcib_ca = { sizeof(struct piixpcib_softc), piixpcib_match, - piixpcib_attach + piixpcib_attach, + NULL, + config_activate_children }; struct cfdriver piixpcib_cd = { |