[src/netbsd-1-4]: src/sys/arch/i386/conf pull up revs 1.262 and 1.264 from tr...

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

details:   https://anonhg.NetBSD.org/src/rev/5e1b54e5073b
branches:  netbsd-1-4
changeset: 469548:5e1b54e5073b
user:      cgd <cgd%NetBSD.org@localhost>
date:      Sat Oct 09 21:49:26 1999 +0000

description:
pull up revs 1.262 and 1.264 from trunk via patch (requested by drochner):
  Remove "nca* at isa?" from i386 GENERIC kernel.  Its probe function
  gives false positives and steps on other hardware.  Fixes PR#8361.

diffstat:

 sys/arch/i386/conf/GENERIC |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r 7bcfe9f3bd44 -r 5e1b54e5073b sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Sat Oct 09 21:32:28 1999 +0000
+++ b/sys/arch/i386/conf/GENERIC        Sat Oct 09 21:49:26 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: GENERIC,v 1.231.2.2 1999/06/21 14:23:49 perry Exp $
+#      $NetBSD: GENERIC,v 1.231.2.3 1999/10/09 21:49:26 cgd Exp $
 #
 #      GENERIC -- everything that's currently supported
 #
@@ -326,8 +326,9 @@
 aic0   at isa? port 0x340 irq 11       # Adaptec 152[02] SCSI
 bha0   at isa? port 0x330 irq ? drq ?  # BusLogic [457]4X SCSI
 bha1   at isa? port 0x334 irq ? drq ?
-nca0   at isa? port 0x360 irq 15       # Port-mapped NCR 53C80 contoller
-nca1   at isa? iomem 0xd8000 irq 5     # Memory-mapped controller (T128, etc.)
+# The "nca" probe might give false hits or hang your machine.
+#nca0  at isa? port 0x360 irq 15       # Port-mapped NCR 53C80 contoller
+#nca1  at isa? iomem 0xd8000 irq 5     # Memory-mapped controller (T128, etc.)
 sea0   at isa? iomem 0xc8000 irq 5     # Seagate/Future Domain SCSI
 uha0   at isa? port 0x330 irq ? drq ?  # UltraStor [13]4f SCSI
 uha1   at isa? port 0x340 irq ? drq ?
@@ -343,7 +344,7 @@
 scsibus* at aic?
 scsibus* at bha?
 scsibus* at isp?
-scsibus* at nca?
+#scsibus* at nca?
 scsibus* at ncr?
 scsibus* at pcscp?
 scsibus* at sea?