From 622a1537a4a4a506bc359e09cb873bdc14455ddf Mon Sep 17 00:00:00 2001
From: Ted Unangst <tedu@cvs.openbsd.org>
Date: Wed, 8 Jun 2016 17:24:45 +0000
Subject: remove obsolete raid from namtoblk tables. from Artturi Alm

---
 sys/arch/alpha/alpha/autoconf.c     | 3 +--
 sys/arch/amd64/amd64/autoconf.c     | 3 +--
 sys/arch/armish/armish/autoconf.c   | 3 +--
 sys/arch/armv7/armv7/autoconf.c     | 3 +--
 sys/arch/i386/i386/autoconf.c       | 3 +--
 sys/arch/macppc/macppc/autoconf.c   | 5 ++---
 sys/arch/socppc/socppc/autoconf.c   | 3 +--
 sys/arch/sparc/sparc/autoconf.c     | 3 +--
 sys/arch/sparc64/sparc64/autoconf.c | 3 +--
 sys/arch/zaurus/zaurus/autoconf.c   | 3 +--
 10 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/sys/arch/alpha/alpha/autoconf.c b/sys/arch/alpha/alpha/autoconf.c
index b9d342dc40e..e24b03c3f84 100644
--- a/sys/arch/alpha/alpha/autoconf.c
+++ b/sys/arch/alpha/alpha/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.35 2011/11/25 05:23:40 miod Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.36 2016/06/08 17:24:44 tedu Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.16 1996/11/13 21:13:04 cgd Exp $	*/
 
 /*
@@ -214,7 +214,6 @@ struct nam2blk nam2blk[] = {
 	{ "rd",		6 },
 	{ "sd",		8 },
 	{ "wd",		0 },
-	{ "raid",	16 },
 	{ "vnd",	9 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/amd64/amd64/autoconf.c b/sys/arch/amd64/amd64/autoconf.c
index f34e557c575..c75907afce5 100644
--- a/sys/arch/amd64/amd64/autoconf.c
+++ b/sys/arch/amd64/amd64/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.46 2016/05/30 17:52:26 tedu Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.47 2016/06/08 17:24:44 tedu Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.1 2003/04/26 18:39:26 fvdl Exp $	*/
 
 /*-
@@ -225,6 +225,5 @@ struct nam2blk nam2blk[] = {
 	{ "cd",		6 },
 	{ "vnd",	14 },
 	{ "rd",		17 },
-	{ "raid",	19 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/armish/armish/autoconf.c b/sys/arch/armish/armish/autoconf.c
index 280c42bc52d..7436b95d46a 100644
--- a/sys/arch/armish/armish/autoconf.c
+++ b/sys/arch/armish/armish/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.12 2011/09/20 22:02:13 miod Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.13 2016/06/08 17:24:44 tedu Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.2 2001/09/05 16:17:36 matt Exp $	*/
 
 /*
@@ -143,7 +143,6 @@ struct nam2blk nam2blk[] = {
 	{ "sd",		24 },
 	{ "cd",		26 },
 	{ "rd",		18 },
-	{ "raid",	71 },
 	{ "vnd",	19 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/armv7/armv7/autoconf.c b/sys/arch/armv7/armv7/autoconf.c
index 970d25aab05..5865e40d4f8 100644
--- a/sys/arch/armv7/armv7/autoconf.c
+++ b/sys/arch/armv7/armv7/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.5 2016/04/10 12:32:46 jsg Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.6 2016/06/08 17:24:44 tedu Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.2 2001/09/05 16:17:36 matt Exp $	*/
 
 /*
@@ -140,7 +140,6 @@ struct nam2blk nam2blk[] = {
 	{ "sd",		24 },
 	{ "cd",		26 },
 	{ "rd",		18 },
-	{ "raid",	71 },
 	{ NULL,		-1 }
 };
 
diff --git a/sys/arch/i386/i386/autoconf.c b/sys/arch/i386/i386/autoconf.c
index 72d9499dfe2..7a00d6b386f 100644
--- a/sys/arch/i386/i386/autoconf.c
+++ b/sys/arch/i386/i386/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.100 2016/05/20 02:30:41 mlarkin Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.101 2016/06/08 17:24:44 tedu Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.20 1996/05/03 19:41:56 christos Exp $	*/
 
 /*-
@@ -256,7 +256,6 @@ struct nam2blk nam2blk[] = {
 	{ "sd",		4 },
 	{ "cd",		6 },
 	{ "rd",		17 },
-	{ "raid",	19 },
 	{ "vnd",	14 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/macppc/macppc/autoconf.c b/sys/arch/macppc/macppc/autoconf.c
index f39f5a40ca5..769247b8c30 100644
--- a/sys/arch/macppc/macppc/autoconf.c
+++ b/sys/arch/macppc/macppc/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.43 2014/04/04 01:50:25 dlg Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.44 2016/06/08 17:24:44 tedu Exp $	*/
 /*
  * Copyright (c) 1996, 1997 Per Fogelstrom
  * Copyright (c) 1995 Theo de Raadt
@@ -37,7 +37,7 @@
  * from: Utah Hdr: autoconf.c 1.31 91/01/21
  *
  *	from: @(#)autoconf.c	8.1 (Berkeley) 6/10/93
- *      $Id: autoconf.c,v 1.43 2014/04/04 01:50:25 dlg Exp $
+ *      $Id: autoconf.c,v 1.44 2016/06/08 17:24:44 tedu Exp $
  */
 
 /*
@@ -284,7 +284,6 @@ struct nam2blk nam2blk[] = {
 	{ "wd",		0 },
 	{ "sd",		2 },
 	{ "rd",		17 },
-	{ "raid",	19 },
 	{ "vnd",	14 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/socppc/socppc/autoconf.c b/sys/arch/socppc/socppc/autoconf.c
index f7447d4e184..122585a80cd 100644
--- a/sys/arch/socppc/socppc/autoconf.c
+++ b/sys/arch/socppc/socppc/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.5 2014/04/01 20:42:39 mpi Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.6 2016/06/08 17:24:44 tedu Exp $	*/
 
 /*
  * Copyright (c) 2008 Mark Kettenis
@@ -68,7 +68,6 @@ struct nam2blk nam2blk[] = {
 	{ "wd",		0 },
 	{ "sd",		2 },
 	{ "rd",		17 },
-	{ "raid",	19 },
 	{ "vnd",	14 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/sparc/sparc/autoconf.c b/sys/arch/sparc/sparc/autoconf.c
index 4022587a28d..a21fa162b7e 100644
--- a/sys/arch/sparc/sparc/autoconf.c
+++ b/sys/arch/sparc/sparc/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.101 2015/09/18 12:50:28 miod Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.102 2016/06/08 17:24:44 tedu Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.73 1997/07/29 09:41:53 fair Exp $ */
 
 /*
@@ -1886,7 +1886,6 @@ struct nam2blk nam2blk[] = {
 	{ "fd",		16 },
 	{ "rd",		17 },
 	{ "cd",		18 },
-	{ "raid",	25 },
 	{ "vnd",	8 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/sparc64/sparc64/autoconf.c b/sys/arch/sparc64/sparc64/autoconf.c
index 6a5087a9c88..0278a81c1fd 100644
--- a/sys/arch/sparc64/sparc64/autoconf.c
+++ b/sys/arch/sparc64/sparc64/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.125 2016/03/07 13:21:51 naddy Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.126 2016/06/08 17:24:44 tedu Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.51 2001/07/24 19:32:11 eeh Exp $ */
 
 /*
@@ -1505,7 +1505,6 @@ struct nam2blk nam2blk[] = {
 	{ "rd",		 5 },
 	{ "wd",		12 },
 	{ "cd",		18 },
-	{ "raid",	25 },
 	{ "vnd",	8 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/zaurus/zaurus/autoconf.c b/sys/arch/zaurus/zaurus/autoconf.c
index 0bbcf5a3c6e..d71f98470e7 100644
--- a/sys/arch/zaurus/zaurus/autoconf.c
+++ b/sys/arch/zaurus/zaurus/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.15 2011/09/20 22:02:13 miod Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.16 2016/06/08 17:24:44 tedu Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.2 2001/09/05 16:17:36 matt Exp $	*/
 
 /*
@@ -142,7 +142,6 @@ struct nam2blk nam2blk[] = {
 	{ "sd",		24 },
 	{ "cd",		26 },
 	{ "rd",		18 },
-	{ "raid",	71 },
 	{ "vnd",	19 },
 	{ NULL,		-1 }
 };
-- 
cgit v1.2.3