[src/trunk]: src/sys/arch Update for acpi file move to sys/arch/x86/x86.

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

details:   https://anonhg.NetBSD.org/src/rev/c1ffee261299
branches:  trunk
changeset: 547031:c1ffee261299
user:      fvdl <fvdl%NetBSD.org@localhost>
date:      Sun May 11 18:24:12 2003 +0000

description:
Update for acpi file move to sys/arch/x86/x86.

diffstat:

 sys/arch/i386/conf/files.i386 |  8 +-------
 sys/arch/x86/conf/files.x86   |  8 +++++++-
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (61 lines):

diff -r e2cde65b10f0 -r c1ffee261299 sys/arch/i386/conf/files.i386
--- a/sys/arch/i386/conf/files.i386     Sun May 11 18:23:17 2003 +0000
+++ b/sys/arch/i386/conf/files.i386     Sun May 11 18:24:12 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.i386,v 1.236 2003/03/25 19:37:14 jmmv Exp $
+#      $NetBSD: files.i386,v 1.237 2003/05/11 18:24:12 fvdl Exp $
 #
 # new style config file for i386 architecture
 #
@@ -43,8 +43,6 @@
 # understand boot device passed by pre-1.3 bootblocks
 defflag                        COMPAT_OLDBOOT
 
-defflag opt_mpacpi.h MPACPI
-
 # PCI BIOS options
 defflag        opt_pcibios.h   PCIBIOS PCIBIOSVERBOSE
                        PCIBIOS_ADDR_FIXUP PCIBIOS_BUS_FIXUP
@@ -309,9 +307,6 @@
 file   arch/i386/i386/apm.c            apm needs-count
 file   arch/i386/i386/apmcall.S        apm
 
-# MP configuration using ACPI
-file   arch/i386/i386/mpacpi.c         mpacpi & acpi
-
 # CPUS
 
 define cpu { [apid = -1] }
@@ -449,7 +444,6 @@
 include        "arch/i386/pnpbios/files.pnpbios"
 
 include "dev/acpi/files.acpi"
-file   arch/i386/i386/acpi_machdep.c   acpi
 file   arch/i386/acpi/acpi_wakeup.c    acpi
 
 # Toshiba VALD 
diff -r e2cde65b10f0 -r c1ffee261299 sys/arch/x86/conf/files.x86
--- a/sys/arch/x86/conf/files.x86       Sun May 11 18:23:17 2003 +0000
+++ b/sys/arch/x86/conf/files.x86       Sun May 11 18:24:12 2003 +0000
@@ -1,7 +1,8 @@
-#      $NetBSD: files.x86,v 1.6 2003/04/25 21:54:30 fvdl Exp $
+#      $NetBSD: files.x86,v 1.7 2003/05/11 18:24:12 fvdl Exp $
 
 # options for MP configuration through the MP spec
 defflag opt_mpbios.h MPBIOS MPVERBOSE MPDEBUG
+defflag opt_mpacpi.h MPACPI
 
 # MTRR support
 defflag                 MTRR
@@ -30,6 +31,11 @@
 # MP configuration using Intel SMP specification 1.4
 file   arch/x86/x86/mpbios.c           mpbios
 
+# MP configuration using ACPI
+file   arch/x86/x86/mpacpi.c           mpacpi & acpi
+
+file    arch/x86/x86/acpi_machdep.c    acpi
+
 file   arch/x86/pci/pci_machdep.c      pci
 
 file   arch/x86/isa/isa_machdep.c      isa