[src/trunk]: src/sys/arch/amd64/conf Swap fdc@isa for fdc@acpi as the former ...

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

details:   https://anonhg.NetBSD.org/src/rev/a229728489b1
branches:  trunk
changeset: 989514:a229728489b1
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Fri Oct 15 19:22:12 2021 +0000

description:
Swap fdc@isa for fdc@acpi as the former takes over a second to probe.

diffstat:

 sys/arch/amd64/conf/GENERIC |  12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diffs (41 lines):

diff -r 9a971430ad9b -r a229728489b1 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Fri Oct 15 19:21:45 2021 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Fri Oct 15 19:22:12 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.590 2021/09/09 13:22:50 jakllsch Exp $
+# $NetBSD: GENERIC,v 1.591 2021/10/15 19:22:12 jmcneill Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC-$Revision: 1.590 $"
+#ident         "GENERIC-$Revision: 1.591 $"
 
 maxusers       64              # estimated number of users
 
@@ -338,7 +338,8 @@
 asus*          at acpi?                # ASUS hotkeys
 attimer*       at acpi?                # AT Timer
 #com*          at acpi?                # Serial communications interface
-#fdc*          at acpi?                # Floppy disk controller
+fdc*           at acpi?                # Floppy disk controller
+fd*            at fdc? drive ?         # the drives themselves
 fujbp*         at acpi?                # Fujitsu Brightness & Pointer
 fujhk*         at acpi?                # Fujitsu Hotkeys
 #hpacel*       at acpi?                # HP 3D DriveGuard accelerometer
@@ -784,11 +785,8 @@
 # Miscellaneous mass storage devices
 
 # ISA floppy
-fdc0   at isa? port 0x3f0 irq 6 drq 2  # standard PC floppy controllers
+#fdc0  at isa? port 0x3f0 irq 6 drq 2  # standard PC floppy controllers
 #fdc1  at isa? port 0x370 irq ? drq ?
-fd*    at fdc? drive ?                 # the drives themselves
-# some machines need you to do this instead of fd*
-#fd0   at fdc0 drive 0
 
 # Network Interfaces