summaryrefslogtreecommitdiff
path: root/sys/arch/amd64/conf
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2020-12-27 23:05:39 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2020-12-27 23:05:39 +0000
commit67f298458263f22ad6b901d5a69c1eb0b513b975 (patch)
treef2309b000d1a88e9a1725866f8974035afdf01c8 /sys/arch/amd64/conf
parentc083384dcef6db10e62018b80a7d74b799000127 (diff)
Enable acpihpet on install media, because otherwise clock initialization
is just too different from GENERIC or GENERIC.MP pointed out by jsg
Diffstat (limited to 'sys/arch/amd64/conf')
-rw-r--r--sys/arch/amd64/conf/RAMDISK4
-rw-r--r--sys/arch/amd64/conf/RAMDISK_CD4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/amd64/conf/RAMDISK b/sys/arch/amd64/conf/RAMDISK
index 3852c3855e8..a2a3e70b7b0 100644
--- a/sys/arch/amd64/conf/RAMDISK
+++ b/sys/arch/amd64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.81 2020/10/16 04:09:25 deraadt Exp $
+# $OpenBSD: RAMDISK,v 1.82 2020/12/27 23:05:37 deraadt Exp $
machine amd64
maxusers 4
@@ -23,7 +23,7 @@ bios0 at mainbus?
acpi0 at bios?
#acpitimer* at acpi?
-#acpihpet* at acpi?
+acpihpet* at acpi?
#acpiac* at acpi?
#acpibat* at acpi?
#acpibtn* at acpi?
diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD
index 91022751e7b..66c6536f7de 100644
--- a/sys/arch/amd64/conf/RAMDISK_CD
+++ b/sys/arch/amd64/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.189 2020/05/14 13:07:11 kettenis Exp $
+# $OpenBSD: RAMDISK_CD,v 1.190 2020/12/27 23:05:37 deraadt Exp $
machine amd64
maxusers 4
@@ -30,7 +30,7 @@ bios0 at mainbus?
acpi0 at bios?
#acpitimer* at acpi?
-#acpihpet* at acpi?
+acpihpet* at acpi?
#acpiac* at acpi?
#acpibat* at acpi?
#acpibtn* at acpi?