Module Name: src
Committed By: pgoyette
Date: Thu Mar 1 04:29:38 UTC 2018
Modified Files:
src/sys/arch/x86/conf: files.x86
src/sys/dev/pci: files.pci
Log Message:
Move the imc and imcsmb stuff out of general files.pci and into the
architecture-specific files.x86
Should unbreak the sgimips build.
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/sys/arch/x86/conf/files.x86
cvs rdiff -u -r1.393 -r1.394 src/sys/dev/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.93 src/sys/arch/x86/conf/files.x86:1.94
--- src/sys/arch/x86/conf/files.x86:1.93 Sun Feb 11 09:39:37 2018
+++ src/sys/arch/x86/conf/files.x86 Thu Mar 1 04:29:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.x86,v 1.93 2018/02/11 09:39:37 maxv Exp $
+# $NetBSD: files.x86,v 1.94 2018/03/01 04:29:38 pgoyette Exp $
# options for MP configuration through the MP spec
defflag opt_mpbios.h MPBIOS MPVERBOSE MPDEBUG MPBIOS_SCANPCI
@@ -161,3 +161,14 @@ 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 dev/imcsmb/imc.c imc
+
+device imcsmb: i2cbus
+attach imcsmb at imc
+file dev/imcsmb/imcsmb.c imcsmb
Index: src/sys/dev/pci/files.pci
diff -u src/sys/dev/pci/files.pci:1.393 src/sys/dev/pci/files.pci:1.394
--- src/sys/dev/pci/files.pci:1.393 Sun Feb 25 08:19:34 2018
+++ src/sys/dev/pci/files.pci Thu Mar 1 04:29:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.393 2018/02/25 08:19:34 pgoyette Exp $
+# $NetBSD: files.pci,v 1.394 2018/03/01 04:29:37 pgoyette Exp $
#
# Config file and device description for machine-independent PCI code.
# Included by ports that need it. Requires that the SCSI files be
@@ -1189,14 +1189,3 @@ include "external/bsd/drm2/pci/files.drm
device ismt: i2cbus
attach ismt at pci
file dev/pci/ismt.c ismt
-
-# Intel Integrated Memory Controller and associated SMBus
-# (Experimental)
-
-device imc {}: imcsmb
-attach imc at pci
-file dev/imcsmb/imc.c imc
-
-device imcsmb: i2cbus
-attach imcsmb at imc
-file dev/imcsmb/imcsmb.c imcsmb
