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/landisk | |
| parent | 92354ff0534fb9949db4078bc0060f95da58f558 (diff) | |
tedu the raidframe.
ok deraadt@
Diffstat (limited to 'sys/arch/landisk')
| -rw-r--r-- | sys/arch/landisk/conf/RAMDISK | 4 | ||||
| -rw-r--r-- | sys/arch/landisk/landisk/conf.c | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/sys/arch/landisk/conf/RAMDISK b/sys/arch/landisk/conf/RAMDISK index 551e5bf1629..f661cdc6928 100644 --- a/sys/arch/landisk/conf/RAMDISK +++ b/sys/arch/landisk/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.15 2011/06/29 20:52:09 matthew Exp $ +# $OpenBSD: RAMDISK,v 1.16 2012/04/06 15:10:40 jsing Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -123,8 +123,6 @@ pseudo-device wsmux 2 #pseudo-device crypto 1 #pseudo-device bio 1 # ioctl multiplexing device #pseudo-device hotplug 1 # devices hot plugging -#pseudo-device raid 4 # RAIDframe disk driver - option BOOT_CONFIG # boot-time kernel config diff --git a/sys/arch/landisk/landisk/conf.c b/sys/arch/landisk/landisk/conf.c index 8842f3bf04c..7da650156bc 100644 --- a/sys/arch/landisk/landisk/conf.c +++ b/sys/arch/landisk/landisk/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.21 2011/10/06 20:49:28 deraadt Exp $ */ +/* $OpenBSD: conf.c,v 1.22 2012/04/06 15:10:40 jsing Exp $ */ /* * Copyright (c) 1994-1998 Mark Brinicombe. @@ -79,7 +79,6 @@ * Disk/Filesystem pseudo-devices */ #include "rd.h" /* memory disk driver */ -#include "raid.h" /* RAIDframe */ #include "vnd.h" /* vnode disk driver */ /* @@ -217,7 +216,7 @@ struct bdevsw bdevsw[] = { bdev_lkm_dummy(), /* 68: */ bdev_lkm_dummy(), /* 69: */ bdev_lkm_dummy(), /* 70: */ - bdev_disk_init(NRAID,raid), /* 71: RAIDframe disk driver */ + bdev_notdef(), /* 71 was: RAIDframe disk driver */ bdev_lkm_dummy(), /* 72: */ bdev_lkm_dummy(), /* 73: */ bdev_lkm_dummy(), /* 74: */ @@ -338,7 +337,7 @@ struct cdevsw cdevsw[] = { cdev_tty_init(NUCOM,ucom), /* 68: USB tty */ cdev_usbdev_init(NUSCANNER,uscanner), /* 69: USB scanner */ cdev_usbdev_init(NUGEN,ugen), /* 70: USB generic driver */ - cdev_disk_init(NRAID,raid), /* 71: RAIDframe disk driver */ + cdev_notdef(), /* 71 was: RAIDframe disk driver */ cdev_lkm_dummy(), /* 72: reserved */ cdev_lkm_dummy(), /* 73: reserved */ cdev_lkm_dummy(), /* 74: reserved */ |