ccd goes to the attic

discussed with jsing and millert

4 files changed, 8 insertions, 12 deletions

diff --git a/sys/arch/amd64/amd64/conf.c b/sys/arch/amd64/amd64/conf.c
index 5fb1bb1ea89..bda6fd125fa 100644
--- a/sys/arch/amd64/amd64/conf.c
+++ b/sys/arch/amd64/amd64/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.35 2011/07/04 22:53:53 tedu Exp $	*/
+/*	$OpenBSD: conf.c,v 1.36 2011/10/06 20:49:27 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Charles M. Hannum.  All rights reserved.
@@ -52,7 +52,6 @@ bdev_decl(fd);
 #include "cd.h"
 #include "uk.h"
 #include "vnd.h"
-#include "ccd.h"
 #include "raid.h"
 #include "rd.h"
 
@@ -73,8 +72,8 @@ struct bdevsw	bdevsw[] =
 	bdev_lkm_dummy(),		/* 12 */
 	bdev_lkm_dummy(),		/* 13 */
 	bdev_disk_init(NVND,vnd),	/* 14: vnode disk driver */
-	bdev_lkm_dummy(),		/* 15: Sony CD-ROM */
-	bdev_disk_init(NCCD,ccd),	/* 16: concatenated disk driver */
+	bdev_notdef(),			/* 15: was: Sony CD-ROM */
+	bdev_notdef(),			/* 16: was: concatenated disk driver */
 	bdev_disk_init(NRD,rd),		/* 17: ram disk driver */
 	bdev_lkm_dummy(),		/* 18 */
 	bdev_disk_init(NRAID,raid),	/* 19: RAIDframe disk driver */
@@ -209,7 +208,7 @@ struct cdevsw	cdevsw[] =
 	cdev_disk_init(NCD,cd),		/* 15: SCSI CD-ROM */
 	cdev_lpt_init(NLPT,lpt),	/* 16: parallel printer */
 	cdev_ch_init(NCH,ch),		/* 17: SCSI autochanger */
-	cdev_disk_init(NCCD,ccd),	/* 18: concatenated disk driver */
+	cdev_notdef(),			/* 18: was: concatenated disk driver */
 	cdev_notdef(),			/* 19 */
 	cdev_uk_init(NUK,uk),		/* 20: unknown SCSI */
 	cdev_notdef(),			/* 21 */
@@ -361,7 +360,7 @@ int chrtoblktbl[] = {
 	/* 15 */	6,		/* cd */
 	/* 16 */	NODEV,
 	/* 17 */	NODEV,
-	/* 18 */	16,		/* ccd */
+	/* 18 */	NODEV,
 	/* 19 */	NODEV,
 	/* 20 */	NODEV,
 	/* 21 */	NODEV,
diff --git a/sys/arch/amd64/conf/RAMDISK b/sys/arch/amd64/conf/RAMDISK
index 03f6accc6d6..994ed65a100 100644
--- a/sys/arch/amd64/conf/RAMDISK
+++ b/sys/arch/amd64/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.53 2011/10/04 15:44:17 deraadt Exp $
+#	$OpenBSD: RAMDISK,v 1.54 2011/10/06 20:49:28 deraadt Exp $
 
 machine		amd64		# architecture, used by config; REQUIRED
 
@@ -248,5 +248,4 @@ pseudo-device	loop	1	# network loopback
 #pseudo-device	ppp	1	# PPP
 pseudo-device	bpfilter 1	# packet filter
 pseudo-device	rd	1	# ramdisk
-#pseudo-device	ccd	4	# concatenated disk devices
 pseudo-device	wsmux	2
diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD
index cab8eba6789..39ead6e2a6e 100644
--- a/sys/arch/amd64/conf/RAMDISK_CD
+++ b/sys/arch/amd64/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK_CD,v 1.119 2011/06/29 20:52:08 matthew Exp $
+#	$OpenBSD: RAMDISK_CD,v 1.120 2011/10/06 20:49:28 deraadt Exp $
 
 machine		amd64		# architecture, used by config; REQUIRED
 
@@ -333,6 +333,5 @@ pseudo-device	loop	1	# network loopback
 pseudo-device	vlan		# IEEE 802.1Q VLAN 
 pseudo-device	bpfilter 1	# packet filter
 pseudo-device	rd	1	# ramdisk
-pseudo-device	ccd	4	# concatenated disk devices
 pseudo-device	wsmux	2
 pseudo-device	bio	1	# ioctl multiplexing device
diff --git a/sys/arch/amd64/conf/files.amd64 b/sys/arch/amd64/conf/files.amd64
index 6123bb48730..91b6a289992 100644
--- a/sys/arch/amd64/conf/files.amd64
+++ b/sys/arch/amd64/conf/files.amd64
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.amd64,v 1.63 2011/07/07 02:57:24 deraadt Exp $
+#	$OpenBSD: files.amd64,v 1.64 2011/10/06 20:49:28 deraadt Exp $
 
 maxpartitions 16
 maxusers 2 16 128
@@ -250,7 +250,6 @@ attach	vmt at mainbus
 # device major numbers
 #
 
-major	{ccd = 16}
 major	{vnd = 14}
 major	{sd = 4}
 major	{st = 5}