summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/i386/conf/GENERIC5
-rw-r--r--sys/arch/i386/conf/files.i3867
-rw-r--r--sys/arch/i386/i386/mainbus.c13
3 files changed, 3 insertions, 22 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index ff895dc9c44..afe9bb4125e 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.550 2007/03/19 03:02:09 marco Exp $
+# $OpenBSD: GENERIC,v 1.551 2007/03/19 14:33:28 dlg Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -50,9 +50,6 @@ pcibios0 at bios0 flags 0x0000 # use 0x30 for a total verbose
ipmi0 at mainbus? # IPMI
esm0 at mainbus? # Dell Embedded Server Management
-#softraid0 at mainbus? # Software RAID
-#scsibus* at softraid?
-
isa0 at mainbus0
isa0 at pcib?
isa0 at ichpcib?
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index 54a34506343..b659ed772dd 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-# $OpenBSD: files.i386,v 1.156 2007/03/19 09:29:33 art Exp $
+# $OpenBSD: files.i386,v 1.157 2007/03/19 14:33:28 dlg Exp $
#
# new style config file for i386 architecture
#
@@ -414,11 +414,6 @@ include "../../../dev/acpi/files.acpi"
file arch/i386/i386/acpi_machdep.c acpi
#
-# SOFTRAID
-#
-attach softraid at mainbus
-
-#
# IPMI
#
attach ipmi at mainbus
diff --git a/sys/arch/i386/i386/mainbus.c b/sys/arch/i386/i386/mainbus.c
index 03b5af4464f..4ae0d4f0da8 100644
--- a/sys/arch/i386/i386/mainbus.c
+++ b/sys/arch/i386/i386/mainbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mainbus.c,v 1.34 2007/03/19 03:02:09 marco Exp $ */
+/* $OpenBSD: mainbus.c,v 1.35 2007/03/19 14:33:28 dlg Exp $ */
/* $NetBSD: mainbus.c,v 1.21 1997/06/06 23:14:20 thorpej Exp $ */
/*
@@ -53,7 +53,6 @@
#include "acpi.h"
#include "ipmi.h"
#include "esm.h"
-#include "softraid.h"
#include "vesabios.h"
#include <machine/cpuvar.h>
@@ -77,10 +76,6 @@
#include <arch/i386/i386/esmvar.h>
#endif
-#if NSOFTRAID > 0
-#include <dev/softraidvar.h>
-#endif
-
#if NVESABIOS > 0
#include <dev/vesa/vesabiosvar.h>
#endif
@@ -286,12 +281,6 @@ mainbus_attach(struct device *parent, struct device *self, void *aux)
#endif
config_found(self, &mba.mba_iba, mainbus_print);
}
-
-#if NSOFTRAID > 0
- memset(&mba.mba_maa, 0, sizeof(mba.mba_maa));
- mba.mba_maa.maa_name = "softraid";
- config_found(self, &mba.mba_maa, mainbus_print);
-#endif
}
int