summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Knudsen <mk@cvs.openbsd.org>2007-04-17 16:07:46 +0000
committerMichael Knudsen <mk@cvs.openbsd.org>2007-04-17 16:07:46 +0000
commita0392593e5e7f493c7cbafa9e71ebf269fa327d6 (patch)
treebdf2285b9aa18f4673b4f11de464f38b57da905a
parentafea8c438f9b8d1926b53df4dc9eceef2454c9e1 (diff)
Now that acpidock no longer hangs machines during boot (at least
according to the reports I've been getting) it should be safe to enable it again, so remove the #if 0 stuff around it. ok marco
-rw-r--r--sys/dev/acpi/acpi.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c
index c44e13adf5f..fd39a1aaaa4 100644
--- a/sys/dev/acpi/acpi.c
+++ b/sys/dev/acpi/acpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpi.c,v 1.87 2007/04/11 02:51:11 jordan Exp $ */
+/* $OpenBSD: acpi.c,v 1.88 2007/04/17 16:07:45 mk Exp $ */
/*
* Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
* Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
@@ -570,10 +570,8 @@ acpi_attach(struct device *parent, struct device *self, void *aux)
/* attach battery, power supply and button devices */
aml_find_node(aml_root.child, "_HID", acpi_foundhid, sc);
-#if 0
/* attach docks */
aml_find_node(aml_root.child, "_DCK", acpi_founddock, sc);
-#endif
/* create list of devices we want to query when APM come in */
SLIST_INIT(&sc->sc_ac);