summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf
diff options
context:
space:
mode:
authorAlexander Yurchenko <grange@cvs.openbsd.org>2006-11-29 19:40:13 +0000
committerAlexander Yurchenko <grange@cvs.openbsd.org>2006-11-29 19:40:13 +0000
commit5b32fbc41626437358f6f1ece8fb1be407e87eca (patch)
treeb80e9273f0748f851705f2505ce666f36071d82d /sys/arch/i386/conf
parent7aa15a56f0736777192c284852a545ef177ffa6a (diff)
Fix the major bug in ips which prevents GENERIC to attach it.
Diffstat (limited to 'sys/arch/i386/conf')
-rw-r--r--sys/arch/i386/conf/GENERIC6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 5e0e06009ce..e4491da6a88 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.542 2006/11/27 18:50:59 marco Exp $
+# $OpenBSD: GENERIC,v 1.543 2006/11/29 19:40:12 grange Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -371,8 +371,8 @@ ciss* at pci? # Compaq Smart ARRAY [56]* RAID controllers
scsibus* at ciss?
iha* at pci? # Initio Ultra/UltraWide SCSI controllers
scsibus* at iha?
-#ips* at pci? # IBM ServeRAID controllers
-#scsibus* at ips?
+ips* at pci? # IBM ServeRAID controllers
+scsibus* at ips?
isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel
scsibus* at isp?
aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers