Module Name: src
Committed By: pgoyette
Date: Mon Feb 22 13:42:04 UTC 2010
Modified Files:
src/sys/arch/amd64/conf: GENERIC
src/sys/arch/i386/conf: ALL
Log Message:
Correct spelling of smscmon and add (commented out) to GENERICs
To generate a diff of this commit:
cvs rdiff -u -r1.268 -r1.269 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.241 -r1.242 src/sys/arch/i386/conf/ALL
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/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.268 src/sys/arch/amd64/conf/GENERIC:1.269
--- src/sys/arch/amd64/conf/GENERIC:1.268 Mon Feb 22 05:59:04 2010
+++ src/sys/arch/amd64/conf/GENERIC Mon Feb 22 13:42:04 2010
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.268 2010/02/22 05:59:04 ahoka Exp $
+# $NetBSD: GENERIC,v 1.269 2010/02/22 13:42:04 pgoyette Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.268 $"
+#ident "GENERIC-$Revision: 1.269 $"
maxusers 64 # estimated number of users
@@ -437,6 +437,10 @@
# SMSC LPC47B397 hardware monitor functions
#smsc0 at isa? port 0x02e
+# SMSC LPC47M192 hardware monitor
+#smscmon* at iic? addr 0x2c
+#smscmon* at iic? addr 0x2d # (alternate address)
+
# AMD 768 and 8111 power/ACPI controllers
amdpm* at pci? dev ? function ? # RNG and SMBus 1.0 interface
#iic* at amdpm? # sensors below are on this bus
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.241 src/sys/arch/i386/conf/ALL:1.242
--- src/sys/arch/i386/conf/ALL:1.241 Mon Feb 22 04:57:43 2010
+++ src/sys/arch/i386/conf/ALL Mon Feb 22 13:42:04 2010
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.241 2010/02/22 04:57:43 pgoyette Exp $
+# $NetBSD: ALL,v 1.242 2010/02/22 13:42:04 pgoyette Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.241 $"
+#ident "ALL-$Revision: 1.242 $"
maxusers 64 # estimated number of users
@@ -687,8 +687,8 @@
lm0 at iic? addr 0x2e flags 0x0
# SMSC LPC47M192 hardware monitor
-smcsmon* at iic? addr 0x2c
-#smcsmon* at iic? addr 0x2d # (alternate address)
+smscmon* at iic? addr 0x2c
+#smscmon* at iic? addr 0x2d # (alternate address)
pic16lc* at iic? addr 0x10 # XBOX PIC16LC
xbseeprom* at iic? addr 0x54 # XBOX serial EEPROM
