Module Name: src
Committed By: jakllsch
Date: Mon May 14 22:11:30 UTC 2018
Modified Files:
src/sys/arch/alpha/conf: GENERIC
Log Message:
Move iic0 at alipm? to iic1. Using iic0 will conflict with the
iic0 at tsciic? on the API CS20.
XXX: Enumerate the similar-to-DS20L I2C devices on the CS20, which
IIRC are not all on the tsciic(4) I2C bus, and comment GENERIC
accordingly.
To generate a diff of this commit:
cvs rdiff -u -r1.380 -r1.381 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.380 src/sys/arch/alpha/conf/GENERIC:1.381
--- src/sys/arch/alpha/conf/GENERIC:1.380 Mon May 14 21:11:39 2018
+++ src/sys/arch/alpha/conf/GENERIC Mon May 14 22:11:30 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.380 2018/05/14 21:11:39 thorpej Exp $
+# $NetBSD: GENERIC,v 1.381 2018/05/14 22:11:30 jakllsch 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.380 $"
+ident "GENERIC-$Revision: 1.381 $"
maxusers 32
@@ -536,7 +536,7 @@ ld* at mlx? unit ?
# Acer Labs M7101 SMBus controller
alipm* at pci? dev ? function ?
-iic0 at alipm?
+iic1 at alipm?
# AlphaServer DS20L i2c devices
#lmenv* at iic0 addr 0x2c
