From: deraadt <deraadt@openbsd.org>
Date: Tue, 27 Jul 2010 16:53:10 +0000 (+0000)
Subject: delete a #if 0 chunk which was used for early development and will never
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=4951a6e2a385133e4b7ac8a9e366368b680e1fd4;p=openbsd

delete a #if 0 chunk which was used for early development and will never
be reused
ok jordan
---

diff --git a/sys/arch/amd64/amd64/acpi_machdep.c b/sys/arch/amd64/amd64/acpi_machdep.c
index 58c48caafed..726b2d45f62 100644
--- a/sys/arch/amd64/amd64/acpi_machdep.c
+++ b/sys/arch/amd64/amd64/acpi_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acpi_machdep.c,v 1.41 2010/07/25 21:43:38 deraadt Exp $	*/
+/*	$OpenBSD: acpi_machdep.c,v 1.42 2010/07/27 16:53:11 deraadt Exp $	*/
 /*
  * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
  *
@@ -242,11 +242,6 @@ acpi_sleep_machdep(struct acpi_softc *sc, int state)
 	}
 
 	/* Resume path continues here */
-#if 0
-	/* Temporarily disabled for debugging purposes */
-	/* Reset the wakeup vector to avoid resuming on reboot */
-	sc->sc_facs->wakeup_vector = 0;
-#endif
 
 #if NISA > 0
 	i8259_default_setup();
diff --git a/sys/arch/i386/i386/acpi_machdep.c b/sys/arch/i386/i386/acpi_machdep.c
index 671fe794171..69d1b599fc2 100644
--- a/sys/arch/i386/i386/acpi_machdep.c
+++ b/sys/arch/i386/i386/acpi_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acpi_machdep.c,v 1.35 2010/07/25 21:43:35 deraadt Exp $	*/
+/*	$OpenBSD: acpi_machdep.c,v 1.36 2010/07/27 16:53:10 deraadt Exp $	*/
 /*
  * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
  *
@@ -260,11 +260,6 @@ acpi_sleep_machdep(struct acpi_softc *sc, int state)
 	}
 
 	/* Resume path continues here */
-#if 0
-        /* Temporarily disabled for debugging purposes */
-        /* Reset the wakeup vector to avoid resuming on reboot */
-        sc->sc_facs->wakeup_vector = 0;
-#endif
 
 #if NISA > 0
 	isa_defaultirq();