summaryrefslogtreecommitdiff
path: root/sys/arch/landisk
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2011-10-06 20:49:30 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2011-10-06 20:49:30 +0000
commit0647d56dd089f299d35587686681e19ad074627d (patch)
tree0bd77a196ba8c5bf639b51b50f88745e18caeec0 /sys/arch/landisk
parenta4b88cea1f45014461763fd53d46221663687d94 (diff)
ccd goes to the attic
discussed with jsing and millert
Diffstat (limited to 'sys/arch/landisk')
-rw-r--r--sys/arch/landisk/landisk/conf.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/arch/landisk/landisk/conf.c b/sys/arch/landisk/landisk/conf.c
index a7f8d89657c..8842f3bf04c 100644
--- a/sys/arch/landisk/landisk/conf.c
+++ b/sys/arch/landisk/landisk/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.20 2011/09/16 21:01:45 miod Exp $ */
+/* $OpenBSD: conf.c,v 1.21 2011/10/06 20:49:28 deraadt Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -78,7 +78,6 @@
/*
* Disk/Filesystem pseudo-devices
*/
-#include "ccd.h" /* concatenated disk driver */
#include "rd.h" /* memory disk driver */
#include "raid.h" /* RAIDframe */
#include "vnd.h" /* vnode disk driver */
@@ -168,7 +167,7 @@ struct bdevsw bdevsw[] = {
bdev_disk_init(NRD,rd), /* 18: memory disk */
bdev_disk_init(NVND,vnd), /* 19: vnode disk driver */
bdev_lkm_dummy(), /* 20: */
- bdev_disk_init(NCCD,ccd), /* 21: concatenated disk driver */
+ bdev_notdef(), /* 21: was: concatenated disk driver */
bdev_lkm_dummy(), /* 22: */
bdev_lkm_dummy(), /* 23: */
bdev_disk_init(NSD,sd), /* 24: SCSI disk */
@@ -285,7 +284,7 @@ struct cdevsw cdevsw[] = {
cdev_disk_init(NRD,rd), /* 18: ram disk driver */
cdev_disk_init(NVND,vnd), /* 19: vnode disk driver */
cdev_lkm_dummy(), /* 20: */
- cdev_disk_init(NCCD,ccd), /* 21: concatenated disk driver */
+ cdev_notdef(), /* 21: was: concatenated disk driver */
cdev_bpf_init(NBPFILTER,bpf), /* 22: Berkeley packet filter */
cdev_lkm_dummy(), /* 23: */
cdev_disk_init(NSD,sd), /* 24: SCSI disk */
@@ -438,7 +437,7 @@ int chrtoblktbl[] = {
/* 18 */ 18, /* rd */
/* 19 */ 19, /* vnd */
/* 20 */ NODEV,
- /* 21 */ 21, /* ccd */
+ /* 21 */ NODEV,
/* 22 */ NODEV,
/* 23 */ NODEV,
/* 24 */ 24, /* sd */