diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2012-04-06 15:10:41 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2012-04-06 15:10:41 +0000 |
| commit | e1010a78096f31d0c53ea35757325ed1b5a84e16 (patch) | |
| tree | 44585f3dbd50c80f5e68bf890bc9452022f7536d /sys/arch/alpha | |
| parent | 92354ff0534fb9949db4078bc0060f95da58f558 (diff) | |
tedu the raidframe.
ok deraadt@
Diffstat (limited to 'sys/arch/alpha')
| -rw-r--r-- | sys/arch/alpha/alpha/conf.c | 7 | ||||
| -rw-r--r-- | sys/arch/alpha/conf/GENERIC | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c index 35c539d719e..9bda6cfd77d 100644 --- a/sys/arch/alpha/alpha/conf.c +++ b/sys/arch/alpha/alpha/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.67 2011/10/06 20:49:27 deraadt Exp $ */ +/* $OpenBSD: conf.c,v 1.68 2012/04/06 15:10:39 jsing Exp $ */ /* $NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $ */ /*- @@ -51,7 +51,6 @@ bdev_decl(fd); #include "sd.h" #include "uk.h" #include "vnd.h" -#include "raid.h" #include "rd.h" #include "bktr.h" #include "radio.h" @@ -74,7 +73,7 @@ struct bdevsw bdevsw[] = bdev_lkm_dummy(), /* 13 */ bdev_lkm_dummy(), /* 14 */ bdev_lkm_dummy(), /* 15 */ - bdev_disk_init(NRAID,raid), /* 16 */ + bdev_notdef(), /* 16 was: RAIDframe disk driver */ }; int nblkdev = nitems(bdevsw); @@ -183,7 +182,7 @@ struct cdevsw cdevsw[] = cdev_spkr_init(NSPKR,spkr), /* 40: PC speaker */ cdev_midi_init(NMIDI,midi), /* 41: MIDI I/O */ cdev_midi_init(NSEQUENCER,sequencer), /* 42: sequencer I/O */ - cdev_disk_init(NRAID,raid), /* 43: RAIDframe disk driver */ + cdev_notdef(), /* 43 was: RAIDframe disk driver */ cdev_video_init(NVIDEO,video), /* 44: generic video I/O */ cdev_usb_init(NUSB,usb), /* 45: USB controller */ cdev_usbdev_init(NUHID,uhid), /* 46: USB generic HID */ diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC index d9bc9e0fb70..b52d45e2fea 100644 --- a/sys/arch/alpha/conf/GENERIC +++ b/sys/arch/alpha/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.226 2011/10/10 12:34:23 jsg Exp $ +# $OpenBSD: GENERIC,v 1.227 2012/04/06 15:10:39 jsing Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -429,7 +429,6 @@ owsbm* at onewire? # Smart Battery Monitor owtemp* at onewire? # Temperature owctr* at onewire? # Counter device -#pseudo-device raid 4 # RAIDframe disk driver pseudo-device crypto 1 pseudo-device sequencer 1 pseudo-device hotplug 1 # devices hot plugging |