summaryrefslogtreecommitdiff
path: root/sys/arch/amd64/conf
diff options
context:
space:
mode:
authorMarco Peereboom <marco@cvs.openbsd.org>2006-03-06 03:13:43 +0000
committerMarco Peereboom <marco@cvs.openbsd.org>2006-03-06 03:13:43 +0000
commit50e4354e596283140e602b29da43d441ad981651 (patch)
tree6bffc24d9375343be87a8260ff8fa48b686b67d0 /sys/arch/amd64/conf
parent61c7ba14e20c8d045f94a8a045d586484f8eea14 (diff)
Rename hpet to acpihpet so that all devices use the same naming convention.
discussed with jordan.
Diffstat (limited to 'sys/arch/amd64/conf')
-rw-r--r--sys/arch/amd64/conf/GENERIC16
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 5fef33b2614..898c0bae9f6 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.115 2006/03/05 09:12:57 jmc Exp $
+# $OpenBSD: GENERIC,v 1.116 2006/03/06 03:13:42 marco Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -45,13 +45,13 @@ pci* at mainbus0
#option ACPIVERBOSE
#option ACPI_ENABLE
-#acpi0 at mainbus?
-#acpitimer* at acpi?
-#hpet* at acpi?
-#acpiac* at acpi?
-#acpibat* at acpi?
-#acpibtn* at acpi?
-#acpicpu* at acpi?
+#acpi0 at mainbus?
+#acpitimer* at acpi?
+#acpihpet* at acpi?
+#acpiac* at acpi?
+#acpibat* at acpi?
+#acpibtn* at acpi?
+#acpicpu* at acpi?
ipmi0 at mainbus? # IPMI