summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authormrg <mrg@NetBSD.org>2018-03-01 06:36:12 +0000
committermrg <mrg@NetBSD.org>2018-03-01 06:36:12 +0000
commitbc9680e363b4ada9e1d7bbf762e7e24bf90ffac5 (patch)
tree8969ea491afa4477a9aa343777111519a3b3225d /sys
parent086d8dd0793bf7f648f3d3a2c1c5b5fedf2b8b17 (diff)
move the imc code into x86/pci/files.pci so that pci is defined in time.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/x86/conf/files.x8613
-rw-r--r--sys/arch/x86/pci/files.pci13
2 files changed, 13 insertions, 13 deletions
diff --git a/sys/arch/x86/conf/files.x86 b/sys/arch/x86/conf/files.x86
index 56272f815a3..95c28dacbe0 100644
--- a/sys/arch/x86/conf/files.x86
+++ b/sys/arch/x86/conf/files.x86
@@ -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 pciide_common
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
diff --git a/sys/arch/x86/pci/files.pci b/sys/arch/x86/pci/files.pci
index ba77bc8f446..cbff0335ab1 100644
--- a/sys/arch/x86/pci/files.pci
+++ b/sys/arch/x86/pci/files.pci
@@ -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-flag
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