summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2006-01-15 14:24:17 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2006-01-15 14:24:17 +0000
commitd17f8a838e455f63be7667833f6fc3258c6496b9 (patch)
tree44cfb71ec63030c2f8ede8527a612e0beb44ce8a /sys/arch/i386/conf
parent2af375e4719d8f59d74ae104748e8a2c556aa5fe (diff)
Comment alipm (and spell out power management for piixpm while I'm there).
Diffstat (limited to 'sys/arch/i386/conf')
-rw-r--r--sys/arch/i386/conf/GENERIC6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index e9a96319ecc..2c3bb21d16e 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.462 2006/01/13 21:59:13 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.463 2006/01/15 14:24:16 kettenis Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -98,9 +98,9 @@ gpio* at nsclpcsio?
gscsio* at isa? port 0x2e # NS Geode SC1100 Super I/O
gscsio* at isa? port 0x15c
iic* at gscsio? # ACCESS.bus 1 & 2
-piixpm* at pci? # Intel PIIX PM
+piixpm* at pci? # Intel PIIX power management
iic* at piixpm?
-alipm* at pci?
+alipm* at pci? # Acer Labs M7101 power management
iic* at alipm?
ichiic* at pci? # Intel ICH SMBus controller
iic* at ichiic?