summaryrefslogtreecommitdiff
path: root/sys/arch/amd64
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2010-08-08 12:27:40 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2010-08-08 12:27:40 +0000
commitec3782a24fd83dad3e83f4fb63b2f8c86018a081 (patch)
treed080556af865f035c77cc5f3e4e43baaec5afbef /sys/arch/amd64
parentff90752552805fec7b9a9b3843b661873c84ad9c (diff)
Disable acpiasus(4); it violates the rule that only the acpi thread is allowed
to run AML in several ways.
Diffstat (limited to 'sys/arch/amd64')
-rw-r--r--sys/arch/amd64/conf/GENERIC4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index d3eea3ff73a..2d3f693bdc1 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.298 2010/08/04 21:44:41 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.299 2010/08/08 12:27:39 kettenis Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -50,7 +50,7 @@ acpiec* at acpi?
acpiprt* at acpi?
acpitz* at acpi?
acpimadt0 at acpi?
-acpiasus* at acpi?
+#acpiasus* at acpi?
acpisony* at acpi?
acpithinkpad* at acpi?
acpivideo* at acpi?