5 files changed, 9 insertions, 30 deletions
diff --git a/sys/arch/macppc/conf/files.macppc b/sys/arch/macppc/conf/files.macppc
index 057a8bd4c3f..077daf740f9 100644
--- a/sys/arch/macppc/conf/files.macppc
+++ b/sys/arch/macppc/conf/files.macppc
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.macppc,v 1.54 2007/04/23 16:27:20 deraadt Exp $
+#	$OpenBSD: files.macppc,v 1.55 2007/06/01 23:14:07 deraadt Exp $
 
 #
 # macppc-specific configuration info
@@ -43,11 +43,7 @@ file	arch/macppc/macppc/mainbus.c			mainbus
 device	cpu
 attach	cpu at mainbus
 file	arch/macppc/macppc/cpu.c
-
-include "../../../dev/ofw/files.ofw"
 file	arch/macppc/macppc/opendev.c
-major	{ofdisk = 4}
-
 
 device	memc {}
 attach	memc at mainbus
diff --git a/sys/arch/macppc/macppc/autoconf.c b/sys/arch/macppc/macppc/autoconf.c
index ee165716fc1..780d10c8c8b 100644
--- a/sys/arch/macppc/macppc/autoconf.c
+++ b/sys/arch/macppc/macppc/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.32 2007/06/01 19:25:10 deraadt Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.33 2007/06/01 23:14:06 deraadt 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.32 2007/06/01 19:25:10 deraadt Exp $
+ *      $Id: autoconf.c,v 1.33 2007/06/01 23:14:06 deraadt Exp $
  */
 
 /*
@@ -288,7 +288,6 @@ diskconf(void)
 struct nam2blk nam2blk[] = {
 	{ "wd",		0 },
 	{ "sd",		2 },
-	{ "ofdisk",	4 },
 	{ "raid",	19 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/macppc/macppc/conf.c b/sys/arch/macppc/macppc/conf.c
index e2c1ef27218..b96011a616d 100644
--- a/sys/arch/macppc/macppc/conf.c
+++ b/sys/arch/macppc/macppc/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.29 2007/02/06 22:39:13 dlg Exp $ */
+/*	$OpenBSD: conf.c,v 1.30 2007/06/01 23:14:06 deraadt Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -51,9 +51,6 @@
 bdev_decl(wd);
 cdev_decl(wd);
 
-#include "ofdisk.h"
-bdev_decl(ofd);
-
 #include "vnd.h"
 #include "ccd.h"
 #include "raid.h"
@@ -63,7 +60,6 @@ struct bdevsw bdevsw[] = {
 	bdev_swap_init(1,sw),		/* 1 swap pseudo device */
 	bdev_disk_init(NSD,sd),		/* 2 SCSI Disk */
 	bdev_disk_init(NCD,cd),		/* 3 SCSI CD-ROM */
-	bdev_disk_init(NOFDISK,ofd),	/* 4 Openfirmware disk */
 	bdev_notdef(),			/* 5 unknown*/
 	bdev_notdef(),			/* 6 unknown*/
 	bdev_notdef(),			/* 7 unknown*/
@@ -85,13 +81,6 @@ int nblkdev = sizeof bdevsw / sizeof bdevsw[0];
 #include "pty.h"
 #include "zstty.h"
 
-#include "ofcons.h"
-cdev_decl(ofc);
-cdev_decl(ofd);
-
-#include "ofrtc.h"
-cdev_decl(ofrtc);
-
 cdev_decl(kbd);
 cdev_decl(ms);
 
@@ -165,8 +154,8 @@ struct cdevsw cdevsw[] = {
 	cdev_notdef(),			/* 10: SCSI changer */
 	cdev_disk_init(NWD,wd),		/* 11: ST506/ESDI/IDE disk */
 	cdev_notdef(),			/* 12 */
-	cdev_disk_init(NOFDISK,ofd),	/* 13 Openfirmware disk */
-	cdev_tty_init(NOFCONS,ofc),	/* 14 Openfirmware console */
+	cdev_notdef(),			/* 13 */
+	cdev_notdef(),			/* 14 */
 	cdev_notdef(),			/* 15 */
 	cdev_notdef(),			/* 16 */
 	cdev_disk_init(NRD,rd),		/* 17 ram disk driver*/
diff --git a/sys/arch/mvmeppc/mvmeppc/autoconf.c b/sys/arch/mvmeppc/mvmeppc/autoconf.c
index 69d6efa1ee5..e1399cc2d83 100644
--- a/sys/arch/mvmeppc/mvmeppc/autoconf.c
+++ b/sys/arch/mvmeppc/mvmeppc/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.18 2007/06/01 19:25:10 deraadt Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.19 2007/06/01 23:14:07 deraadt 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.18 2007/06/01 19:25:10 deraadt Exp $
+ *      $Id: autoconf.c,v 1.19 2007/06/01 23:14:07 deraadt Exp $
  */
 
 /*
@@ -178,7 +178,6 @@ getdevunit(name, unit)
 struct nam2blk nam2blk[] = {
 	{ "wd",		0 },
 	{ "sd",		2 },
-	{ "ofdisk",	4 },
 	{ "raid",	19 },
 	{ NULL,		-1 }
 };
diff --git a/sys/arch/mvmeppc/mvmeppc/conf.c b/sys/arch/mvmeppc/mvmeppc/conf.c
index 3965d05f5c2..20fb253a6d7 100644
--- a/sys/arch/mvmeppc/mvmeppc/conf.c
+++ b/sys/arch/mvmeppc/mvmeppc/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.20 2007/05/28 22:26:03 todd Exp $ */
+/*	$OpenBSD: conf.c,v 1.21 2007/06/01 23:14:07 deraadt Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -61,11 +61,7 @@ struct bdevsw bdevsw[] = {
 	bdev_swap_init(1,sw),		/* 1 swap pseudo device */
 	bdev_disk_init(NSD,sd),		/* 2 SCSI Disk */
 	bdev_disk_init(NCD,cd),		/* 3 SCSI CD-ROM */
-#if 0
-	bdev_disk_init(NOFDISK,ofd),	/* 4 Openfirmware disk */
-#else
 	bdev_notdef(),                  /* 4 unknown*/
-#endif 
 	bdev_notdef(),                  /* 5 unknown*/
 	bdev_notdef(),                  /* 6 unknown*/
 	bdev_notdef(),                  /* 7 unknown*/