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/i386 | |
| parent | 92354ff0534fb9949db4078bc0060f95da58f558 (diff) | |
tedu the raidframe.
ok deraadt@
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/arch/i386/i386/conf.c | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 7546dd084e3..e3d8ceff48f 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.732 2012/03/06 12:48:07 mikeb Exp $ +# $OpenBSD: GENERIC,v 1.733 2012/04/06 15:10:39 jsing Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -780,7 +780,6 @@ pseudo-device pctr 1 pseudo-device mtrr 1 # Memory range attributes control pseudo-device nvram 1 pseudo-device sequencer 1 -#pseudo-device raid 4 # RAIDframe disk driver pseudo-device hotplug 1 # devices hot plugging # mouse & keyboard multiplexor pseudo-devices diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c index 918ff59d360..27b26e486dd 100644 --- a/sys/arch/i386/i386/conf.c +++ b/sys/arch/i386/i386/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.139 2011/10/06 20:49:28 deraadt Exp $ */ +/* $OpenBSD: conf.c,v 1.140 2012/04/06 15:10:39 jsing 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 "raid.h" #include "rd.h" struct bdevsw bdevsw[] = @@ -77,7 +76,7 @@ struct bdevsw bdevsw[] = 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 */ + bdev_notdef(), /* 19 was: RAIDframe disk driver */ }; int nblkdev = nitems(bdevsw); @@ -256,7 +255,7 @@ struct cdevsw cdevsw[] = #endif cdev_midi_init(NMIDI,midi), /* 52: MIDI I/O */ cdev_midi_init(NSEQUENCER,sequencer), /* 53: sequencer I/O */ - cdev_disk_init(NRAID,raid), /* 54: RAIDframe disk driver */ + cdev_notdef(), /* 54 was: RAIDframe disk driver */ cdev_notdef(), /* 55: */ /* The following slots are reserved for isdn4bsd. */ cdev_notdef(), /* 56: i4b main device */ |