[src/netbsd-1-4]: src/sys/dev/isa Pull up revision 1.89:

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

details:   https://anonhg.NetBSD.org/src/rev/b18497492998
branches:  netbsd-1-4
changeset: 469356:b18497492998
user:      he <he%NetBSD.org@localhost>
date:      Fri Sep 10 22:42:56 1999 +0000

description:
Pull up revision 1.89:
  The nca driver mistakenly detects an i82585tx as its hardware.
  Move the nca driver probe after the iy probe (which is more
  friendly to other hardware).  (is)

diffstat:

 sys/dev/isa/files.isa |  13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diffs (34 lines):

diff -r b22f6d878e80 -r b18497492998 sys/dev/isa/files.isa
--- a/sys/dev/isa/files.isa     Fri Sep 10 22:37:10 1999 +0000
+++ b/sys/dev/isa/files.isa     Fri Sep 10 22:42:56 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.isa,v 1.83 1999/03/22 22:33:36 bad Exp $
+#      $NetBSD: files.isa,v 1.83.2.1 1999/09/10 22:42:56 he Exp $
 #
 # Config file and device description for machine-independent ISA code.
 # Included by ports that need it.  Requires that the SCSI files be
@@ -107,11 +107,6 @@
 attach wds at isa
 file   dev/isa/wds.c                   wds
 
-# NCR 5380-based boards
-device nca: scsi, ncr5380sbc
-attach nca at isa
-file   dev/isa/nca.c                   nca
-
 #
 # Other ISA disk controllers
 #
@@ -201,6 +196,12 @@
 attach iy at isa
 file    dev/isa/if_iy.c                        iy
 
+# the probe routine of this "recognizes" the iy. Probe after it.
+# NCR 5380-based boards
+device nca: scsi, ncr5380sbc
+attach nca at isa
+file   dev/isa/nca.c                   nca
+
 # AMD am7990 (Lance) -based boards
 # (BICC Isolan, NE2100, DEPCA)
 # device declaration in sys/conf/files