diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amiga/amiga/conf.c | 9 | ||||
| -rw-r--r-- | sys/arch/amiga/amiga/swapgeneric.c | 9 | ||||
| -rw-r--r-- | sys/arch/powerpc/conf/files.powerpc | 4 |
3 files changed, 5 insertions, 17 deletions
diff --git a/sys/arch/amiga/amiga/conf.c b/sys/arch/amiga/amiga/conf.c index 925522aede9..9332a08f9e4 100644 --- a/sys/arch/amiga/amiga/conf.c +++ b/sys/arch/amiga/amiga/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.25 1998/09/25 09:20:52 todd Exp $ */ +/* $OpenBSD: conf.c,v 1.26 1999/07/30 19:41:29 deraadt Exp $ */ /* $NetBSD: conf.c,v 1.42 1997/01/07 11:35:03 mrg Exp $ */ /*- @@ -59,7 +59,6 @@ #include "ccd.h" #include "ss.h" #include "wd.h" -#include "acd.h" #include "rd.h" #include "ch.h" #ifdef XFS @@ -85,7 +84,7 @@ struct bdevsw bdevsw[] = bdev_lkm_dummy(), /* 12 */ bdev_lkm_dummy(), /* 13 */ bdev_lkm_dummy(), /* 14 */ - bdev_disk_init(NACD,acd), /* 15: ATAPI CD-ROM */ + bdev_notdef(), /* 15 */ bdev_disk_init(NRD,rd), /* 16: ram disk driver */ }; int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]); @@ -149,7 +148,7 @@ struct cdevsw cdevsw[] = cdev_random_init(1,random), /* 35: random data source */ cdev_uk_init(NUK,uk), /* 36: unknown SCSI */ cdev_disk_init(NWD,wd), /* 37: ST506/ESDI/IDE disk */ - cdev_disk_init(NACD,acd), /* 38: ATAPI CD-ROM */ + cdev_notdef(), /* 38 */ cdev_audio_init(NAUDIO,audio), /* 39: cc audio interface */ cdev_ch_init(NCH,ch), /* 40: SCSI autochanger */ cdev_disk_init(NRD,rd), /* 41: RAM disk */ @@ -268,7 +267,7 @@ static int chrtoblktab[] = { /* 35 */ NODEV, /* 36 */ NODEV, /* 37 */ 0, /* wd */ - /* 38 */ 15, /* acd */ + /* 38 */ NODEV, /* 39 */ NODEV, /* 40 */ NODEV, /* 41 */ 16, /* rd */ diff --git a/sys/arch/amiga/amiga/swapgeneric.c b/sys/arch/amiga/amiga/swapgeneric.c index fc4e1f1df57..18b362c8711 100644 --- a/sys/arch/amiga/amiga/swapgeneric.c +++ b/sys/arch/amiga/amiga/swapgeneric.c @@ -1,4 +1,4 @@ -/* $OpenBSD: swapgeneric.c,v 1.11 1998/03/01 16:07:18 niklas Exp $ */ +/* $OpenBSD: swapgeneric.c,v 1.12 1999/07/30 19:41:29 deraadt Exp $ */ /* $NetBSD: swapgeneric.c,v 1.27 1997/01/26 22:58:32 rat Exp $ */ /* @@ -53,7 +53,6 @@ #include "sd.h" #include "wd.h" #include "cd.h" -#include "acd.h" int (*mountroot) __P((void)) = dk_mountroot; @@ -82,9 +81,6 @@ extern struct cfdriver wd_cd; #if NCD > 0 extern struct cfdriver cd_cd; #endif -#if NACD > 0 -extern struct cfdriver acd_cd; -#endif struct genericconf { struct cfdriver *gc_driver; @@ -111,9 +107,6 @@ struct genericconf genericconf[] = { #if NCD > 0 {&cd_cd, makedev(7, 0)}, #endif -#if NACD > 0 - {&acd_cd, makedev(15, 0)}, -#endif { 0 }, }; diff --git a/sys/arch/powerpc/conf/files.powerpc b/sys/arch/powerpc/conf/files.powerpc index 1cf72012c8c..51146ccbae0 100644 --- a/sys/arch/powerpc/conf/files.powerpc +++ b/sys/arch/powerpc/conf/files.powerpc @@ -5,10 +5,6 @@ maxpartitions 16 maxusers 2 8 64 -# need some decl. from here... -include "../../../dev/atapi/files.atapi" -major { acd = 5 } - file arch/powerpc/powerpc/Locore.c file arch/powerpc/powerpc/autoconf.c file arch/powerpc/powerpc/bcopy.c |