Module Name: src
Committed By: thorpej
Date: Mon May 14 21:11:39 UTC 2018
Modified Files:
src/sys/arch/alpha/conf: GENERIC
Log Message:
Fully specifiy the location of indirectly-configured I2C devices. In
particular, the parent spec must not be wild-carded, as doing so doesn't
work well on systems where more than one I2C bus is present.
To generate a diff of this commit:
cvs rdiff -u -r1.379 -r1.380 src/sys/arch/alpha/conf/GENERIC
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/alpha/conf/GENERIC
diff -u src/sys/arch/alpha/conf/GENERIC:1.379 src/sys/arch/alpha/conf/GENERIC:1.380
--- src/sys/arch/alpha/conf/GENERIC:1.379 Tue Jan 23 14:47:53 2018
+++ src/sys/arch/alpha/conf/GENERIC Mon May 14 21:11:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.379 2018/01/23 14:47:53 sevan Exp $
+# $NetBSD: GENERIC,v 1.380 2018/05/14 21:11:39 thorpej Exp $
#
# This machine description file is used to generate the default NetBSD
# kernel.
@@ -19,7 +19,7 @@ include "arch/alpha/conf/std.alpha"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.379 $"
+ident "GENERIC-$Revision: 1.380 $"
maxusers 32
@@ -210,7 +210,7 @@ mcmem* at mcbus? mid ?
tsc* at mainbus0
tsciic* at tsc?
-iic* at tsciic?
+iic0 at tsciic?
# DECpc AXP150 (Jensen) internal bus support
jensenio* at mainbus0
@@ -536,21 +536,21 @@ ld* at mlx? unit ?
# Acer Labs M7101 SMBus controller
alipm* at pci? dev ? function ?
-iic* at alipm?
+iic0 at alipm?
# AlphaServer DS20L i2c devices
-#lmenv* at iic? addr 0x2c
-#lmenv* at iic? addr 0x2d
-#lmenv* at iic? addr 0x2e
-#lmenv* at iic? addr 0x2f
-#spdmem* at iic? addr 0x50
-#spdmem* at iic? addr 0x51
-#spdmem* at iic? addr 0x52
-#spdmem* at iic? addr 0x53
-#spdmem* at iic? addr 0x54
-#spdmem* at iic? addr 0x55
-#spdmem* at iic? addr 0x56
-#spdmem* at iic? addr 0x57
+#lmenv* at iic0 addr 0x2c
+#lmenv* at iic0 addr 0x2d
+#lmenv* at iic0 addr 0x2e
+#lmenv* at iic0 addr 0x2f
+#spdmem* at iic0 addr 0x50
+#spdmem* at iic0 addr 0x51
+#spdmem* at iic0 addr 0x52
+#spdmem* at iic0 addr 0x53
+#spdmem* at iic0 addr 0x54
+#spdmem* at iic0 addr 0x55
+#spdmem* at iic0 addr 0x56
+#spdmem* at iic0 addr 0x57
#seeprom* at iic0 addr 0x51 flags 0x2
# PCMCIA USB controllers