Module Name: src Committed By: chs Date: Sun May 2 17:24:36 UTC 2010
Modified Files: src/sys/arch/i386/conf: GENERIC Log Message: add alipm and its iic bus. To generate a diff of this commit: cvs rdiff -u -r1.980 -r1.981 src/sys/arch/i386/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/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.980 src/sys/arch/i386/conf/GENERIC:1.981 --- src/sys/arch/i386/conf/GENERIC:1.980 Fri Apr 16 13:48:32 2010 +++ src/sys/arch/i386/conf/GENERIC Sun May 2 17:24:35 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.980 2010/04/16 13:48:32 pooka Exp $ +# $NetBSD: GENERIC,v 1.981 2010/05/02 17:24:35 chs Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.980 $" +#ident "GENERIC-$Revision: 1.981 $" maxusers 64 # estimated number of users @@ -614,7 +614,11 @@ # 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 +iic* at amdpm? + +# Acer Labs M7101 SMBus controller +alipm* at pci? dev ? function ? +iic* at alipm? # Intel Core's on-die Thermal sensor options INTEL_CORETEMP