summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
authorAlexander Yurchenko <grange@cvs.openbsd.org>2006-01-05 22:26:55 +0000
committerAlexander Yurchenko <grange@cvs.openbsd.org>2006-01-05 22:26:55 +0000
commitfe277c1551d2b8d6643de7a43bb2fecab748d70b (patch)
tree8a0372a7d5f2fcff7d9cc75f665f6fc69bd0e68b /sys/arch/i386
parent58b16dda99bbbbebc098058800131a783dbed215 (diff)
Enable amdpm; ok deraadt@.
Diffstat (limited to 'sys/arch/i386')
-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 3cf34b27428..c7cc22dbf4e 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.458 2006/01/05 20:04:10 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.459 2006/01/05 22:26:54 grange Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -110,8 +110,8 @@ amdiic* at pci? # AMD-8111 SMBus controller
iic* at amdiic?
#nviic* at pci? # NVIDIA nForce2/3/4 SMBus controller
#iic* at nviic?
-#amdpm* at pci? # AMD-76x PM and SMBus controller
-#iic* at amdpm?
+amdpm* at pci? # AMD-76x PM and SMBus controller
+iic* at amdpm?
it0 at isa? port 0x290 # IT8705F, IT8712F and SiS970 hardware
it1 at isa? port 0xc00 # monitors