Module Name: src
Committed By: mrg
Date: Thu Mar 1 06:36:13 UTC 2018
Modified Files:
src/sys/arch/x86/conf: files.x86
src/sys/arch/x86/pci: files.pci
Log Message:
move the imc code into x86/pci/files.pci so that pci is defined in time.
To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 src/sys/arch/x86/conf/files.x86
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/x86/pci/files.pci
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/conf/files.x86
diff -u src/sys/arch/x86/conf/files.x86:1.96 src/sys/arch/x86/conf/files.x86:1.97
--- src/sys/arch/x86/conf/files.x86:1.96 Thu Mar 1 04:45:05 2018
+++ src/sys/arch/x86/conf/files.x86 Thu Mar 1 06:36:12 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.x86,v 1.96 2018/03/01 04:45:05 pgoyette Exp $
+# $NetBSD: files.x86,v 1.97 2018/03/01 06:36:12 mrg Exp $
# options for MP configuration through the MP spec
defflag opt_mpbios.h MPBIOS MPVERBOSE MPDEBUG MPBIOS_SCANPCI
@@ -161,14 +161,3 @@ file arch/x86/pci/pciide_machdep.c pciid
file arch/x86/pci/pci_bus_fixup.c pci_bus_fixup
file arch/x86/pci/pci_addr_fixup.c pci_addr_fixup
-
-# Intel Integrated Memory Controller and associated SMBus
-# (Experimental)
-
-device imc {}: imcsmb
-attach imc at pci
-file arch/x86/pci/imcsmb/imc.c imc
-
-device imcsmb: i2cbus
-attach imcsmb at imc
-file arch/x86/pci/imcsmb/imcsmb.c imcsmb
Index: src/sys/arch/x86/pci/files.pci
diff -u src/sys/arch/x86/pci/files.pci:1.23 src/sys/arch/x86/pci/files.pci:1.24
--- src/sys/arch/x86/pci/files.pci:1.23 Sat Jan 27 00:21:41 2018
+++ src/sys/arch/x86/pci/files.pci Thu Mar 1 06:36:12 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.23 2018/01/27 00:21:41 christos Exp $
+# $NetBSD: files.pci,v 1.24 2018/03/01 06:36:12 mrg Exp $
device aapic
attach aapic at pci
@@ -84,3 +84,14 @@ file arch/x86/pci/fwhrng.c fwhrng needs
device vmx: ether, ifnet, arp
attach vmx at pci
file arch/x86/pci/if_vmx.c vmx
+
+# Intel Integrated Memory Controller and associated SMBus
+# (Experimental)
+
+device imc {}: imcsmb
+attach imc at pci
+file arch/x86/pci/imcsmb/imc.c imc
+
+device imcsmb: i2cbus
+attach imcsmb at imc
+file arch/x86/pci/imcsmb/imcsmb.c imcsmb
