minor space savings

2 files changed, 19 insertions, 7 deletions

diff --git a/sys/arch/alpha/alpha/api_up1000.c b/sys/arch/alpha/alpha/api_up1000.c
index ca5538ba3a6..4b9042c52a0 100644
--- a/sys/arch/alpha/alpha/api_up1000.c
+++ b/sys/arch/alpha/alpha/api_up1000.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: api_up1000.c,v 1.6 2002/06/25 21:33:19 miod Exp $	*/
+/*	$OpenBSD: api_up1000.c,v 1.7 2004/07/18 02:29:11 deraadt Exp $	*/
 /* $NetBSD: api_up1000.c,v 1.4 2000/06/20 03:48:53 matt Exp $ */
 
 /*
@@ -82,7 +82,7 @@ void
 api_up1000_init()
 {
 
-	platform.family = "Alpha Processor, Inc. UP1000";
+	platform.family = "API UP1000";
 
 	if ((platform.model = alpha_dsr_sysname()) == NULL) {
 		/* XXX Don't know the system variations, yet. */
diff --git a/sys/arch/alpha/alpha/autoconf.c b/sys/arch/alpha/alpha/autoconf.c
index 51c00114733..8e5ec66fb15 100644
--- a/sys/arch/alpha/alpha/autoconf.c
+++ b/sys/arch/alpha/alpha/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.22 2003/06/02 23:27:43 millert Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.23 2004/07/18 02:29:11 deraadt Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.16 1996/11/13 21:13:04 cgd Exp $	*/
 
 /*
@@ -136,13 +136,28 @@ struct nam2blk {
 	char *name;
 	int maj;
 } nam2blk[] = {
+#include "st.h"
+#if NST > 0
 	{ "st",		2 },
+#endif
+#include "cd.h"
+#if NCD > 0
 	{ "cd",		3 },
+#endif
+#include "fd.h"
+#if NFD > 0
 	{ "fd",		4 },
+#endif
+#include "rd.h"
+#if NRD > 0
 	{ "rd",		6 },
+#endif
 	{ "sd",		8 },
 	{ "wd",		0 },
+#include "raid.h"
+#if NRAID > 0
 	{ "raid",	16 },
+#endif
 };
 
 #ifdef RAMDISK_HOOKS
@@ -369,10 +384,7 @@ setroot()
 					nswapdev = MAKEDISKDEV(major(nrootdev),
 					    DISKUNIT(nrootdev), 1);
 					break;
-				case DV_TAPE:
-				case DV_TTY:
-				case DV_DULL:
-				case DV_CPU:
+				default:
 					break;
 				}
 				swapdv = rootdv;