From 0a8802d424478b0d21eef2e569bd7fc262e90b18 Mon Sep 17 00:00:00 2001
From: Miod Vallat <miod@cvs.openbsd.org>
Date: Tue, 14 Sep 2010 16:57:18 +0000
Subject: Undo unrelated changes commitedby mistake.

---
 sys/arch/sgi/stand/boot/boot.c    | 10 ++++------
 sys/arch/sgi/stand/libsa32/heap.h |  0
 2 files changed, 4 insertions(+), 6 deletions(-)
 delete mode 100644 sys/arch/sgi/stand/libsa32/heap.h

(limited to 'sys/arch')

diff --git a/sys/arch/sgi/stand/boot/boot.c b/sys/arch/sgi/stand/boot/boot.c
index b1543181ed3..6d488d1bd2b 100644
--- a/sys/arch/sgi/stand/boot/boot.c
+++ b/sys/arch/sgi/stand/boot/boot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: boot.c,v 1.16 2010/09/14 16:55:10 miod Exp $ */
+/*	$OpenBSD: boot.c,v 1.17 2010/09/14 16:57:15 miod Exp $ */
 
 /*
  * Copyright (c) 2004 Opsycon AB, www.opsycon.se.
@@ -148,11 +148,9 @@ dobootopts(int argc, char **argv)
 			SystemPartition = &cp[16];
 	}
 
-	/* If "OSLoadFilename=" is missing, see if any arg was given. */
-	if (bootauto == AUTO_NONE) {
-		if (*argv[1] == '/')
-			OSLoadFilename = argv[1];
-	}
+	/* If "OSLoadOptions=" is missing, see if any arg was given. */
+	if (bootauto == AUTO_NONE && *argv[1] == '/')
+		OSLoadFilename = argv[1];
 
 	if (bootauto == AUTO_MINI) {
 		static char loadpart[64];
diff --git a/sys/arch/sgi/stand/libsa32/heap.h b/sys/arch/sgi/stand/libsa32/heap.h
deleted file mode 100644
index e69de29bb2d..00000000000
-- 
cgit v1.2.3