From 1cca41c19e0f0ff4f6e14b656033de707088596c Mon Sep 17 00:00:00 2001
From: Ted Unangst <tedu@cvs.openbsd.org>
Date: Sun, 26 Jun 2011 21:37:53 +0000
Subject: remove remnants of scd device, discovered by Frederic Perrin

---
 sys/arch/amd64/stand/libsa/dev_i386.c  | 4 ++--
 sys/arch/amd64/stand/pxeboot/devopen.c | 4 ++--
 sys/arch/i386/i386/machdep.c           | 4 ++--
 sys/arch/i386/stand/libsa/dev_i386.c   | 4 ++--
 sys/arch/i386/stand/pxeboot/devopen.c  | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'sys')

diff --git a/sys/arch/amd64/stand/libsa/dev_i386.c b/sys/arch/amd64/stand/libsa/dev_i386.c
index f6228c60bad..69487614d8c 100644
--- a/sys/arch/amd64/stand/libsa/dev_i386.c
+++ b/sys/arch/amd64/stand/libsa/dev_i386.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dev_i386.c,v 1.6 2010/12/06 22:51:45 jasper Exp $	*/
+/*	$OpenBSD: dev_i386.c,v 1.7 2011/06/26 21:37:52 tedu Exp $	*/
 
 /*
  * Copyright (c) 1996-1999 Michael Shalayeff
@@ -36,7 +36,7 @@ extern int debug;
 /* XXX use slot for 'rd' for 'hd' pseudo-device */
 const char bdevs[][4] = {
 	"wd", "", "fd", "", "sd", "st", "cd", "mcd",
-	"", "", "", "", "", "", "", "scd", "", "hd", ""
+	"", "", "", "", "", "", "", "", "", "hd", ""
 };
 const int nbdevs = nitems(bdevs);
 
diff --git a/sys/arch/amd64/stand/pxeboot/devopen.c b/sys/arch/amd64/stand/pxeboot/devopen.c
index f5fd09b817b..82036bb0910 100644
--- a/sys/arch/amd64/stand/pxeboot/devopen.c
+++ b/sys/arch/amd64/stand/pxeboot/devopen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: devopen.c,v 1.7 2010/12/06 22:51:45 jasper Exp $	*/
+/*	$OpenBSD: devopen.c,v 1.8 2011/06/26 21:37:52 tedu Exp $	*/
 
 /*
  * Copyright (c) 2004 Tom Cosgrove
@@ -43,7 +43,7 @@ extern char *bootmac;		/* Gets passed to kernel for network boot */
 /* XXX use slot for 'rd' for 'hd' pseudo-device */
 const char bdevs[][4] = {
 	"wd", "", "fd", "", "sd", "st", "cd", "mcd",
-	"", "", "", "", "", "", "", "scd", "", "hd", ""
+	"", "", "", "", "", "", "", "", "", "hd", ""
 };
 const int nbdevs = nitems(bdevs);
 
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index be2d0b94c7f..4f00a58d790 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.500 2011/06/05 19:41:07 deraadt Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.501 2011/06/26 21:37:52 tedu Exp $	*/
 /*	$NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $	*/
 
 /*-
@@ -83,7 +83,6 @@
 #include <sys/mbuf.h>
 #include <sys/msgbuf.h>
 #include <sys/mount.h>
-#include <sys/vnode.h>
 #include <sys/device.h>
 #include <sys/extent.h>
 #include <sys/sysctl.h>
@@ -101,6 +100,7 @@
 
 #include <uvm/uvm_extern.h>
 #include <uvm/uvm_swap.h>
+#include <uvm/uvm.h>
 
 #include <machine/bus.h>
 
diff --git a/sys/arch/i386/stand/libsa/dev_i386.c b/sys/arch/i386/stand/libsa/dev_i386.c
index 099055faef1..a24621d3aae 100644
--- a/sys/arch/i386/stand/libsa/dev_i386.c
+++ b/sys/arch/i386/stand/libsa/dev_i386.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dev_i386.c,v 1.33 2010/12/06 22:51:46 jasper Exp $	*/
+/*	$OpenBSD: dev_i386.c,v 1.34 2011/06/26 21:37:52 tedu Exp $	*/
 
 /*
  * Copyright (c) 1996-1999 Michael Shalayeff
@@ -36,7 +36,7 @@ extern int debug;
 /* XXX use slot for 'rd' for 'hd' pseudo-device */
 const char bdevs[][4] = {
 	"wd", "", "fd", "", "sd", "st", "cd", "mcd",
-	"", "", "", "", "", "", "", "scd", "", "hd", ""
+	"", "", "", "", "", "", "", "", "", "hd", ""
 };
 const int nbdevs = nitems(bdevs);
 
diff --git a/sys/arch/i386/stand/pxeboot/devopen.c b/sys/arch/i386/stand/pxeboot/devopen.c
index 06cab9b2b75..82036bb0910 100644
--- a/sys/arch/i386/stand/pxeboot/devopen.c
+++ b/sys/arch/i386/stand/pxeboot/devopen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: devopen.c,v 1.7 2010/12/06 22:51:46 jasper Exp $	*/
+/*	$OpenBSD: devopen.c,v 1.8 2011/06/26 21:37:52 tedu Exp $	*/
 
 /*
  * Copyright (c) 2004 Tom Cosgrove
@@ -43,7 +43,7 @@ extern char *bootmac;		/* Gets passed to kernel for network boot */
 /* XXX use slot for 'rd' for 'hd' pseudo-device */
 const char bdevs[][4] = {
 	"wd", "", "fd", "", "sd", "st", "cd", "mcd",
-	"", "", "", "", "", "", "", "scd", "", "hd", ""
+	"", "", "", "", "", "", "", "", "", "hd", ""
 };
 const int nbdevs = nitems(bdevs);
 
-- 
cgit v1.2.3