summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2012-04-09 16:55:23 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2012-04-09 16:55:23 +0000
commit4a11b51ba4418f2d7414949ba408ba49ab185fba (patch)
tree46ab59e710501992e64b13d784cfae2d0bcc567f
parent92c83f480df669d773e23164b46812f34d2b715a (diff)
Attach eisa devices after all the onboard devices have attached rather than
before them.
-rw-r--r--sys/arch/sgi/localbus/imc.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/sgi/localbus/imc.c b/sys/arch/sgi/localbus/imc.c
index 83034518c12..2003029c407 100644
--- a/sys/arch/sgi/localbus/imc.c
+++ b/sys/arch/sgi/localbus/imc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: imc.c,v 1.2 2012/04/02 20:40:52 miod Exp $ */
+/* $OpenBSD: imc.c,v 1.3 2012/04/09 16:55:22 miod Exp $ */
/* $NetBSD: imc.c,v 1.32 2011/07/01 18:53:46 dyoung Exp $ */
/*
@@ -651,6 +651,12 @@ imc_attach(struct device *parent, struct device *self, void *aux)
imc_write(IMC_GIO64ARB, reg);
+ memset(&iaa, 0, sizeof(iaa));
+ iaa.iaa_name = "gio";
+ iaa.iaa_st = &imcbus_tag;
+ iaa.iaa_dmat = &imc_bus_dma_tag;
+ config_found(self, &iaa, imc_print);
+
#if NEISA > 0
if (have_eisa) {
memset(&eba, 0, sizeof(eba));
@@ -663,12 +669,6 @@ imc_attach(struct device *parent, struct device *self, void *aux)
}
#endif
- memset(&iaa, 0, sizeof(iaa));
- iaa.iaa_name = "gio";
- iaa.iaa_st = &imcbus_tag;
- iaa.iaa_dmat = &imc_bus_dma_tag;
- config_found(self, &iaa, imc_print);
-
/* Clear CPU/GIO error status registers to clear any leftover bits. */
imc_bus_reset();