diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2011-10-06 20:49:30 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2011-10-06 20:49:30 +0000 |
| commit | 0647d56dd089f299d35587686681e19ad074627d (patch) | |
| tree | 0bd77a196ba8c5bf639b51b50f88745e18caeec0 /sys/arch/i386 | |
| parent | a4b88cea1f45014461763fd53d46221663687d94 (diff) | |
ccd goes to the attic
discussed with jsing and millert
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/conf/RAMDISK_CD | 3 | ||||
| -rw-r--r-- | sys/arch/i386/conf/files.i386 | 4 | ||||
| -rw-r--r-- | sys/arch/i386/i386/conf.c | 9 |
3 files changed, 6 insertions, 10 deletions
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD index d6a6579c0ae..c63a2e718ac 100644 --- a/sys/arch/i386/conf/RAMDISK_CD +++ b/sys/arch/i386/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.190 2011/06/29 20:52:09 matthew Exp $ +# $OpenBSD: RAMDISK_CD,v 1.191 2011/10/06 20:49:28 deraadt Exp $ machine i386 # architecture, used by config; REQUIRED @@ -408,6 +408,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/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386 index 83028a3ec64..516fbee3f20 100644 --- a/sys/arch/i386/conf/files.i386 +++ b/sys/arch/i386/conf/files.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: files.i386,v 1.207 2011/07/08 20:15:09 ariane Exp $ +# $OpenBSD: files.i386,v 1.208 2011/10/06 20:49:28 deraadt Exp $ # # new style config file for i386 architecture # @@ -8,8 +8,6 @@ maxpartitions 16 maxusers 2 16 100 -major {ccd = 16} - file arch/i386/i386/autoconf.c file arch/i386/i386/bus_space.c file arch/i386/i386/bus_dma.c diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c index 5bc677714c5..918ff59d360 100644 --- a/sys/arch/i386/i386/conf.c +++ b/sys/arch/i386/i386/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.138 2011/07/04 22:53:53 tedu Exp $ */ +/* $OpenBSD: conf.c,v 1.139 2011/10/06 20:49:28 deraadt Exp $ */ /* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */ /* @@ -53,7 +53,6 @@ bdev_decl(fd); #include "cd.h" #include "uk.h" #include "vnd.h" -#include "ccd.h" #include "raid.h" #include "rd.h" @@ -75,7 +74,7 @@ struct bdevsw bdevsw[] = bdev_lkm_dummy(), /* 13 */ bdev_disk_init(NVND,vnd), /* 14: vnode disk driver */ bdev_notdef(), /* 15 */ - bdev_disk_init(NCCD,ccd), /* 16: concatenated disk driver */ + bdev_notdef(), /* 16: was: concatenated disk driver */ bdev_disk_init(NRD,rd), /* 17: ram disk driver */ bdev_notdef(), /* 18 */ bdev_disk_init(NRAID,raid), /* 19: RAIDframe disk driver */ @@ -213,7 +212,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_acpiapm_init(1,acpiapm), /* 21: Power Management stuff */ @@ -364,7 +363,7 @@ int chrtoblktbl[] = { /* 15 */ 6, /* cd */ /* 16 */ NODEV, /* 17 */ NODEV, - /* 18 */ 16, /* ccd */ + /* 18 */ NODEV, /* 19 */ NODEV, /* 20 */ NODEV, /* 21 */ NODEV, |