remove support for non-existent scd and pcd drivers. ok deraadt millert

3 files changed, 5 insertions, 19 deletions

diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index bd91b939417..ace7202d277 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.i386,v 1.108 2003/08/07 08:32:56 markus Exp $
+#	$OpenBSD: files.i386,v 1.109 2003/11/03 03:35:40 tedu Exp $
 #	$NetBSD: files.i386,v 1.73 1996/05/07 00:58:36 thorpej Exp $
 #
 # new style config file for i386 architecture
@@ -130,7 +130,6 @@ file	dev/pci/if_hme_pci.c		hme_pci
 #
 
 major	{mcd = 7}
-#major	{scd = 15}
 major	{wd = 0}
 major	{wt = 3}
 
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index 3d45ae2d281..1f611b60029 100644
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.104 2003/09/23 16:51:11 millert Exp $	*/
+/*	$OpenBSD: conf.c,v 1.105 2003/11/03 03:35:40 tedu Exp $	*/
 /*	$NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $	*/
 
 /*
@@ -58,8 +58,6 @@ bdev_decl(wt);
 #include "mcd.h"
 bdev_decl(mcd);
 #include "vnd.h"
-#include "scd.h"
-bdev_decl(scd);
 #include "ccd.h"
 #include "raid.h"
 #include "rd.h"
@@ -81,7 +79,7 @@ struct bdevsw	bdevsw[] =
 	bdev_lkm_dummy(),		/* 12 */
 	bdev_lkm_dummy(),		/* 13 */
 	bdev_disk_init(NVND,vnd),	/* 14: vnode disk driver */
-	bdev_disk_init(NSCD,scd),	/* 15: Sony CD-ROM */
+	bdev_notdef(),			/* 15 */
 	bdev_disk_init(NCCD,ccd),	/* 16: concatenated disk driver */
 	bdev_disk_init(NRD,rd),		/* 17: ram disk driver */
 	bdev_notdef(),			/* 18 */
@@ -135,7 +133,6 @@ cdev_decl(wd);
 cdev_decl(com);
 cdev_decl(fd);
 cdev_decl(wt);
-cdev_decl(scd);
 #include "ss.h"
 #include "lpt.h"
 cdev_decl(lpt);
@@ -222,7 +219,7 @@ struct cdevsw	cdevsw[] =
 #endif
 	cdev_disk_init(NFD,fd),		/* 9: floppy disk */
 	cdev_tape_init(NWT,wt),		/* 10: QIC-02/QIC-36 tape */
-	cdev_disk_init(NSCD,scd),	/* 11: Sony CD-ROM */
+	cdev_notdef(),			/* 11 */
 	cdev_wsdisplay_init(NWSDISPLAY,	/* 12: frame buffers, etc. */
 	    wsdisplay),
 	cdev_disk_init(NSD,sd),		/* 13: SCSI disk */
diff --git a/sys/dev/isa/files.isa b/sys/dev/isa/files.isa
index 46f637d2368..156a44c8668 100644
--- a/sys/dev/isa/files.isa
+++ b/sys/dev/isa/files.isa
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.isa,v 1.84 2003/05/20 20:26:27 grange Exp $
+#	$OpenBSD: files.isa,v 1.85 2003/11/03 03:35:40 tedu Exp $
 #	$NetBSD: files.isa,v 1.21 1996/05/16 03:45:55 mycroft Exp $
 #
 # Config file and device description for machine-independent ISA code.
@@ -132,16 +132,6 @@ device	mcd: disk, opti
 attach	mcd at isa
 file	dev/isa/mcd.c			mcd needs-flag
 
-# Sony CDU-3[13]A CD-ROM controllers
-device	scd: disk, opti
-attach	scd at isa
-file	dev/isa/scd.c			scd needs-flag
-
-# Panasonic/Creative CD-ROM controllers
-device	pcd: disk, opti
-attach	pcd at isa
-file	dev/isa/pcd.c			pcd needs-flag
-
 # ISA "wd" (ESDI/IDE/etc.) controllers, ATAPI bus
 attach wdc at isa with wdc_isa: isa_dma
 file   dev/isa/wdc_isa.c                wdc_isa