summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorMarco Peereboom <marco@cvs.openbsd.org>2006-01-19 03:50:45 +0000
committerMarco Peereboom <marco@cvs.openbsd.org>2006-01-19 03:50:45 +0000
commit8a70a8881cee57842293bc32dc3654012c513e5a (patch)
tree81770506856fb7581adbd39915c06f29536ef2af /sys/arch
parent137c376f4c30fa4f0d0904aa282d8bc43c073dde (diff)
Flip BIOS and ACPI around since ACPI uses BIOS stuff.
ok dlg@ grange@
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/i386/i386/mainbus.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/arch/i386/i386/mainbus.c b/sys/arch/i386/i386/mainbus.c
index eac5b240918..fe0cf10b75b 100644
--- a/sys/arch/i386/i386/mainbus.c
+++ b/sys/arch/i386/i386/mainbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mainbus.c,v 1.22 2006/01/18 05:09:23 marco Exp $ */
+/* $OpenBSD: mainbus.c,v 1.23 2006/01/19 03:50:44 marco Exp $ */
/* $NetBSD: mainbus.c,v 1.21 1997/06/06 23:14:20 thorpej Exp $ */
/*
@@ -146,6 +146,14 @@ mainbus_attach(parent, self, aux)
printf("\n");
+#if NBIOS > 0
+ {
+ mba.mba_bios.bios_dev = "bios";
+ mba.mba_bios.bios_iot = I386_BUS_SPACE_IO;
+ mba.mba_bios.bios_memt = I386_BUS_SPACE_MEM;
+ config_found(self, &mba.mba_bios, mainbus_print);
+ }
+#endif
#if NACPI > 0
{
memset(&mba.mba_aaa, 0, sizeof(mba.mba_aaa));
@@ -157,14 +165,6 @@ mainbus_attach(parent, self, aux)
config_found(self, &mba.mba_aaa, mainbus_print);
}
#endif
-#if NBIOS > 0
- {
- mba.mba_bios.bios_dev = "bios";
- mba.mba_bios.bios_iot = I386_BUS_SPACE_IO;
- mba.mba_bios.bios_memt = I386_BUS_SPACE_MEM;
- config_found(self, &mba.mba_bios, mainbus_print);
- }
-#endif
#if NIPMI > 0
{
memset(&mba.mba_iaa, 0, sizeof(mba.mba_iaa));