[src/trunk]: src/sys/arch/x86/pci Add back proper MPBIOS/MPACPI handling.

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/42251be7973f
branches:  trunk
changeset: 588097:42251be7973f
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Tue Feb 07 20:38:43 2006 +0000

description:
Add back proper MPBIOS/MPACPI handling.

diffstat:

 sys/arch/x86/pci/pci_machdep.c |  15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diffs (36 lines):

diff -r a5931aecdf5f -r 42251be7973f sys/arch/x86/pci/pci_machdep.c
--- a/sys/arch/x86/pci/pci_machdep.c    Tue Feb 07 20:37:24 2006 +0000
+++ b/sys/arch/x86/pci/pci_machdep.c    Tue Feb 07 20:38:43 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pci_machdep.c,v 1.13 2006/02/03 19:58:21 bouyer Exp $  */
+/*     $NetBSD: pci_machdep.c,v 1.14 2006/02/07 20:38:43 bouyer Exp $  */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -80,7 +80,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.13 2006/02/03 19:58:21 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.14 2006/02/07 20:38:43 bouyer Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -103,6 +103,17 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcidevs.h>
 
+#include "opt_mpbios.h"
+#include "opt_mpacpi.h"
+
+#ifdef MPBIOS
+#include <machine/mpbiosvar.h>
+#endif
+
+#ifdef MPACPI
+#include <machine/mpacpi.h>
+#endif
+
 #include "opt_pci_conf_mode.h"
 
 int pci_mode = -1;