summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2010-08-08 14:27:44 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2010-08-08 14:27:44 +0000
commit20f12717cdf91fe1a3685fea5fcce3a2f9333978 (patch)
tree0128467b2873bcc5c9511c0b7fd2c83c18a775a5
parent261b4acddad506aa7c1ab50029df3ee71e2bb311 (diff)
Reenable acpiasus(4). The bogus code is actually dead code, and jsing@'s
eeepc panics without this driver (which must be a bug in the acpi code that this driver just hides).
-rw-r--r--sys/arch/amd64/conf/GENERIC4
-rw-r--r--sys/arch/i386/conf/GENERIC4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 2d3f693bdc1..51476816e4f 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.299 2010/08/08 12:27:39 kettenis Exp $
+# $OpenBSD: GENERIC,v 1.300 2010/08/08 14:27:43 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?
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 1c709d4223f..28d3bec1894 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.694 2010/08/08 12:27:39 kettenis Exp $
+# $OpenBSD: GENERIC,v 1.695 2010/08/08 14:27:42 kettenis Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -59,7 +59,7 @@ acpiec* at acpi?
acpimadt0 at acpi?
acpiprt* at acpi?
acpitz* at acpi?
-#acpiasus* at acpi?
+acpiasus* at acpi?
acpisony* at acpi?
acpithinkpad* at acpi?
acpivideo* at acpi?