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/alpha | |
| parent | a4b88cea1f45014461763fd53d46221663687d94 (diff) | |
ccd goes to the attic
discussed with jsing and millert
Diffstat (limited to 'sys/arch/alpha')
| -rw-r--r-- | sys/arch/alpha/alpha/conf.c | 9 | ||||
| -rw-r--r-- | sys/arch/alpha/conf/files.alpha | 3 |
2 files changed, 5 insertions, 7 deletions
diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c index 9c3d11cb594..35c539d719e 100644 --- a/sys/arch/alpha/alpha/conf.c +++ b/sys/arch/alpha/alpha/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.66 2011/01/14 19:04:08 jasper Exp $ */ +/* $OpenBSD: conf.c,v 1.67 2011/10/06 20:49:27 deraadt Exp $ */ /* $NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $ */ /*- @@ -52,7 +52,6 @@ bdev_decl(fd); #include "uk.h" #include "vnd.h" #include "raid.h" -#include "ccd.h" #include "rd.h" #include "bktr.h" #include "radio.h" @@ -66,7 +65,7 @@ struct bdevsw bdevsw[] = bdev_disk_init(NFD,fd), /* 4: Floppy disk */ bdev_notdef(), /* 5 */ bdev_disk_init(NRD,rd), /* 6: ram disk driver */ - bdev_disk_init(NCCD,ccd), /* 7: concatenated disk driver */ + bdev_notdef(), /* 7: was: concatenated disk driver */ bdev_disk_init(NSD,sd), /* 8: SCSI disk */ bdev_disk_init(NVND,vnd), /* 9: vnode disk driver */ bdev_lkm_dummy(), /* 10 */ @@ -168,7 +167,7 @@ struct cdevsw cdevsw[] = cdev_audio_init(NAUDIO,audio), /* 24: generic audio I/O */ cdev_wsdisplay_init(NWSDISPLAY,wsdisplay), /* 25: workstation console */ cdev_tty_init(NCOM,com), /* 26: ns16550 UART */ - cdev_disk_init(NCCD,ccd), /* 27: concatenated disk driver */ + cdev_notdef(), /* 27: was: concatenated disk driver */ cdev_disk_init(NRD,rd), /* 28: ram disk driver */ cdev_mouse_init(NWSKBD,wskbd), /* 29: /dev/kbd XXX */ cdev_mouse_init(NWSMOUSE,wsmouse), /* 30: /dev/mouse XXX */ @@ -290,7 +289,7 @@ int chrtoblktbl[] = { /* 24 */ NODEV, /* 25 */ NODEV, /* 26 */ NODEV, - /* 27 */ 7, /* ccd */ + /* 27 */ NODEV, /* 28 */ 6, /* rd */ /* 29 */ NODEV, /* 30 */ NODEV, diff --git a/sys/arch/alpha/conf/files.alpha b/sys/arch/alpha/conf/files.alpha index 14f80dc1555..73c31a39268 100644 --- a/sys/arch/alpha/conf/files.alpha +++ b/sys/arch/alpha/conf/files.alpha @@ -1,4 +1,4 @@ -# $OpenBSD: files.alpha,v 1.91 2010/12/06 20:10:17 jasper Exp $ +# $OpenBSD: files.alpha,v 1.92 2011/10/06 20:49:28 deraadt Exp $ # $NetBSD: files.alpha,v 1.32 1996/11/25 04:03:21 cgd Exp $ # # alpha-specific configuration info @@ -29,7 +29,6 @@ device cpu {} # not really optional attach cpu at mainbus file arch/alpha/alpha/cpu.c cpu -major {ccd = 7} major {vnd = 9} # |