[src/netbsd-1-5]: src/sys/arch/alpha/conf Update from trunk:

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4266871fb7ce
branches:  netbsd-1-5
changeset: 488467:4266871fb7ce
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed Jul 12 20:57:12 2000 +0000

description:
Update from trunk:
Change from `ncr' to `siop' by default.

diffstat:

 sys/arch/alpha/conf/BABYLON |  14 +++++++++-----
 sys/arch/alpha/conf/MINI-ME |   8 +++++---
 sys/arch/alpha/conf/RAWHIDE |   9 ++++++---
 3 files changed, 20 insertions(+), 11 deletions(-)

diffs (94 lines):

diff -r 8295a06b3970 -r 4266871fb7ce sys/arch/alpha/conf/BABYLON
--- a/sys/arch/alpha/conf/BABYLON       Wed Jul 12 20:56:02 2000 +0000
+++ b/sys/arch/alpha/conf/BABYLON       Wed Jul 12 20:57:12 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: BABYLON,v 1.16 2000/03/22 00:58:16 cgd Exp $
+# $NetBSD: BABYLON,v 1.16.4.1 2000/07/12 20:57:12 thorpej Exp $
 #
 #      BABYLON -- babylon.netbsd.org, the new mail server
 #
@@ -172,8 +172,10 @@
 #fxp*  at      pci? dev ? function ?           # Intel EEPRO 10+/100B
 #isp*  at      pci? dev ? function ?           # Qlogic ISP 10x0 SCSI
 #le*   at      pci? dev ? function ?           # PCI LANCE Ethernet (untested)
-ncr0   at      pci0 dev 7 function 0           # NCR 53c8xx SCSI
-ncr*   at      pci? dev ? function ?           # NCR 53c8xx SCSI
+#ncr0  at      pci0 dev 7 function 0           # NCR 53c8xx SCSI
+#ncr*  at      pci? dev ? function ?           # NCR 53c8xx SCSI
+siop0  at      pci? dev 7 function ?           # Symbios 53c8xx SCSI
+siop*  at      pci? dev ? function ?           # Symbios 53c8xx SCSI
 #pceb* at      pci? dev ? function ?           # Intel PCI-EISA Bridges
 #ppb*  at      pci? dev ? function ?           # PCI-PCI Bridges
 pciide*        at      pci? dev ? function ?           # PCI IDE controllers
@@ -229,8 +231,10 @@
 #scsibus* at   asc?
 #scsibus* at   bha?
 #scsibus* at   isp?
-scsibus0 at    ncr0
-scsibus* at    ncr?
+#scsibus0 at   ncr0
+#scsibus* at   ncr?
+scsibus0 at    siop0
+scsibus* at    siop?
 #scsibus* at   uha?
 
 # SCSI devices
diff -r 8295a06b3970 -r 4266871fb7ce sys/arch/alpha/conf/MINI-ME
--- a/sys/arch/alpha/conf/MINI-ME       Wed Jul 12 20:56:02 2000 +0000
+++ b/sys/arch/alpha/conf/MINI-ME       Wed Jul 12 20:57:12 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: MINI-ME,v 1.2 2000/05/23 02:04:30 thorpej Exp $
+# $NetBSD: MINI-ME,v 1.2.4.1 2000/07/12 20:57:12 thorpej Exp $
 #
 # mini-me.shagadelic.org - thorpej's Multia
 #
@@ -156,7 +156,8 @@
 #fxp*  at      pci? dev ? function ?           # Intel EEPRO 10+/100B
 #isp*  at      pci? dev ? function ?           # Qlogic ISP 10x0 SCSI
 #le*   at      pci? dev ? function ?           # PCI LANCE Ethernet (untested)
-ncr*   at      pci? dev ? function ?           # NCR 53c8xx SCSI
+#ncr*  at      pci? dev ? function ?           # NCR 53c8xx SCSI
+siop*  at      pci? dev ? function ?           # Symbios 53c8xx SCSI
 #pceb* at      pci? dev ? function ?           # Intel PCI-EISA Bridges
 #ppb*  at      pci? dev ? function ?           # PCI-PCI Bridges
 #pciide*       at      pci? dev ? function ?           # PCI IDE controllers
@@ -231,7 +232,8 @@
 #scsibus* at   asc?
 #scsibus* at   bha?
 #scsibus* at   isp?
-scsibus* at    ncr?
+#scsibus* at   ncr?
+scsibus* at    siop?
 #scsibus* at   uha?
 
 # SCSI devices
diff -r 8295a06b3970 -r 4266871fb7ce sys/arch/alpha/conf/RAWHIDE
--- a/sys/arch/alpha/conf/RAWHIDE       Wed Jul 12 20:56:02 2000 +0000
+++ b/sys/arch/alpha/conf/RAWHIDE       Wed Jul 12 20:57:12 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: RAWHIDE,v 1.9 2000/05/23 02:04:30 thorpej Exp $
+# $NetBSD: RAWHIDE,v 1.9.4.1 2000/07/12 20:57:13 thorpej Exp $
 #
 # Alpha 4100 stripped for action server kernel.
 #
@@ -61,7 +61,8 @@
 fpa*   at      pci? dev ? function ?           # DEC DEFPA FDDI
 fxp*   at      pci? dev ? function ?           # Intel EEPRO 10+/100B
 isp*   at      pci? dev ? function ?           # Qlogic ISP 10x0 SCSI
-ncr*   at      pci? dev ? function ?           # NCR 53c8xx SCSI
+#ncr*  at      pci? dev ? function ?           # NCR 53c8xx SCSI
+siop*  at      pci? dev ? function ?           # Symbios 53c8xx SCSI
 pceb*  at      pci? dev ? function ?           # Intel PCI-EISA Bridges
 ppb*   at      pci? dev ? function ?           # PCI-PCI Bridges
 sio*   at      pci? dev ? function ?           # Intel PCI-ISA Bridges
@@ -78,7 +79,9 @@
 scsibus* at    ahc?
 scsibus* at    bha?
 scsibus* at    isp?
-scsibus* at    ncr?
+#scsibus* at   ncr?
+scsibus* at    siop?
+
 cd*    at      scsibus? target ? lun ?
 sd*    at      scsibus? target ? lun ?
 st*    at      scsibus? target ? lun ?