summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtur Grabowski <art@cvs.openbsd.org>2000-11-07 11:25:25 +0000
committerArtur Grabowski <art@cvs.openbsd.org>2000-11-07 11:25:25 +0000
commit516721df4c0e52ec7ae7130337119b7cc64c81e2 (patch)
treef317c28f3f3ae095508681c692824408f191af3e
parentca214d56c7d1213e2a8a4de22562376707b03ae7 (diff)
Cleanup some ifdefs in the powerdown code.
-rw-r--r--sys/arch/sparc/sparc/machdep.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/arch/sparc/sparc/machdep.c b/sys/arch/sparc/sparc/machdep.c
index 2ee80aa751c..649ba2a7ab7 100644
--- a/sys/arch/sparc/sparc/machdep.c
+++ b/sys/arch/sparc/sparc/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.51 2000/10/27 00:16:20 mickey Exp $ */
+/* $OpenBSD: machdep.c,v 1.52 2000/11/07 11:25:24 art Exp $ */
/* $NetBSD: machdep.c,v 1.85 1997/09/12 08:55:02 pk Exp $ */
/*
@@ -825,18 +825,16 @@ boot(howto)
if (howto & RB_POWERDOWN) {
#if NPOWER > 0 || NTCTRL >0
printf("attempting to power down...\n");
-#endif
#if NPOWER > 0
powerdown();
#endif
#if NTCTRL > 0
tadpole_powerdown();
#endif
-#if NPOWER > 0 || NTCTRL >0
printf("WARNING: powerdown failed!\n");
-#endif
+#endif /* NPOWER || MTCTRL */
}
-#endif
+#endif /* SUN4M */
printf("halted\n\n");
romhalt();
}