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 58c48ca..726b2d4 100644 (file)
--- 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 671fe79..69d1b59 100644 (file)
--- 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();