summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2009-10-29 15:16:02 +0000
committerderaadt <deraadt@openbsd.org>2009-10-29 15:16:02 +0000
commitb40f4c8f40ce300f201a6c24c2a8882b385a9a2e (patch)
tree567c83828bddfbbe445741e182d84d09bc5fc26c
parentvarious fixes from netbsd -r1.35 and -r1.36 (snj@netbsd) (diff)
downloadwireguard-openbsd-b40f4c8f40ce300f201a6c24c2a8882b385a9a2e.tar.xz
wireguard-openbsd-b40f4c8f40ce300f201a6c24c2a8882b385a9a2e.zip
add isp(4), but disable it since on most machines the pci bus is earlier
than the root disk... annoying.
-rw-r--r--sys/arch/hppa/conf/GENERIC4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC
index 1ae81bf915d..d16d91c32e8 100644
--- a/sys/arch/hppa/conf/GENERIC
+++ b/sys/arch/hppa/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.129 2009/08/09 20:29:08 miod Exp $
+# $OpenBSD: GENERIC,v 1.130 2009/10/29 15:16:02 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -257,7 +257,7 @@ scsibus* at mpi?
#bha* at eisa?
#bha* at pci?
#scsibus* at bha?
-isp* at pci? disable # Qlogic ISP [12]0x0 SCSI/FibreChannel
+isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel
scsibus* at isp?
siop* at mainbus? irq 3 # NCR 53C720 (Fast-Wide HVD)